From 85b58f4e61c987402023656e2176f20b5ad26c99 Mon Sep 17 00:00:00 2001 From: Sham Rathod Date: Wed, 29 Mar 2023 11:11:59 +0530 Subject: [PATCH] Remove @SuppressLint("RestrictedApi") To access APIs of tvprovider library without warnings. Bug: 138150076 --- .../tv/classics/receivers/TvLauncherReceiver.kt | 14 +++++++------- .../android/tv/classics/utils/TvLauncherUtils.kt | 2 -- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ClassicsKotlin/app/src/main/java/com/android/tv/classics/receivers/TvLauncherReceiver.kt b/ClassicsKotlin/app/src/main/java/com/android/tv/classics/receivers/TvLauncherReceiver.kt index d3ab84ac5..fc7ad53d6 100644 --- a/ClassicsKotlin/app/src/main/java/com/android/tv/classics/receivers/TvLauncherReceiver.kt +++ b/ClassicsKotlin/app/src/main/java/com/android/tv/classics/receivers/TvLauncherReceiver.kt @@ -16,7 +16,6 @@ package com.android.tv.classics.receivers -import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -104,7 +103,6 @@ class TvLauncherReceiver : BroadcastReceiver() { * Helper method used to retrieve a metadata item object given its program ID. Restricted API * is being used to compared programs based on their ID. */ - @SuppressLint("RestrictedApi") private fun getMediaItemFromProgramId( context: Context, db: TvMediaDatabase, programId: Long?): TvMediaMetadata? { @@ -112,12 +110,14 @@ class TvLauncherReceiver : BroadcastReceiver() { if (programId == null) return null // Retrieve the program that matches this ID - val programItem = - TvLauncherUtils.getPreviewPrograms(context).find { it.id == programId } ?: - TvLauncherUtils.getWatchNextPrograms(context).find { it.id == programId } - + val previewProgramItem = + TvLauncherUtils.getPreviewPrograms(context).find { it.id == programId } + // Retrieve the corresponding metadata item and return + if(previewProgramItem != null) + return previewProgramItem.let { db.metadata().findById(it.contentId) } // Retrieve the corresponding metadata item and return - return programItem?.let { db.metadata().findById(it.contentId) } + val watchNextProgramItem = TvLauncherUtils.getWatchNextPrograms(context).find { it.id == programId } + return watchNextProgramItem?.let { db.metadata().findById(it.contentId) } } companion object { diff --git a/ClassicsKotlin/app/src/main/java/com/android/tv/classics/utils/TvLauncherUtils.kt b/ClassicsKotlin/app/src/main/java/com/android/tv/classics/utils/TvLauncherUtils.kt index 6734d7392..4a41ca98f 100755 --- a/ClassicsKotlin/app/src/main/java/com/android/tv/classics/utils/TvLauncherUtils.kt +++ b/ClassicsKotlin/app/src/main/java/com/android/tv/classics/utils/TvLauncherUtils.kt @@ -16,7 +16,6 @@ package com.android.tv.classics.utils -import android.annotation.SuppressLint import android.content.ContentResolver import android.content.Context import android.content.res.Resources @@ -37,7 +36,6 @@ import com.android.tv.classics.models.TvMediaCollection /** Collection of static methods used to handle Android TV Home Screen Launcher operations */ @RequiresApi(26) -@SuppressLint("RestrictedApi") class TvLauncherUtils private constructor() { companion object { private val TAG = TvLauncherUtils::class.java.simpleName