diff --git a/core/api/current.txt b/core/api/current.txt index c75d4fd0312e5..87ede5955410e 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -27422,6 +27422,7 @@ package android.media.tv.interactive { method public void onTracksChanged(@NonNull java.util.List); method public void onTuned(@NonNull android.net.Uri); method public void onTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo); + method public void onTvRecordingInfoList(@NonNull java.util.List); method public void onVideoAvailable(); method public void onVideoUnavailable(int); method @CallSuper public void removeBroadcastInfo(int); @@ -27485,6 +27486,7 @@ package android.media.tv.interactive { method public void sendStreamVolume(float); method public void sendTrackInfoList(@Nullable java.util.List); method public void sendTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo); + method public void sendTvRecordingInfoList(@NonNull java.util.List); method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback); method public void setOnUnhandledInputEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener); method public void setTeletextAppEnabled(boolean); diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppService.java b/media/java/android/media/tv/interactive/TvInteractiveAppService.java index b7141d19a528f..cdaa3e50e17d3 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppService.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppService.java @@ -615,13 +615,13 @@ public abstract class TvInteractiveAppService extends Service { } /** - * Receives requested recording info. + * Receives requested recording info list. * - * @param recordingInfoList The requested recording info list. Null if recording not found. - * @hide + * @see #requestTvRecordingInfoList(int) + * @param recordingInfoList The list of recording info requested. Returns an empty list if + * no matching recording info found. */ - public void onTvRecordingInfoList(@Nullable List recordingInfoList) { - } + public void onTvRecordingInfoList(@NonNull List recordingInfoList) {} /** * Receives started recording's ID. diff --git a/media/java/android/media/tv/interactive/TvInteractiveAppView.java b/media/java/android/media/tv/interactive/TvInteractiveAppView.java index ae04ce80aa2d6..0b44a890f7ccd 100755 --- a/media/java/android/media/tv/interactive/TvInteractiveAppView.java +++ b/media/java/android/media/tv/interactive/TvInteractiveAppView.java @@ -650,10 +650,11 @@ public class TvInteractiveAppView extends ViewGroup { /** * Sends the requested {@link android.media.tv.TvRecordingInfo}. * - * @param recordingInfoList The list of recording info requested. - * @hide + * @see TvInteractiveAppService.Session#requestTvRecordingInfoList(int) + * @param recordingInfoList The list of recording info requested. Returns an empty list if no + * matching recording info found. */ - public void sendTvRecordingInfoList(@Nullable List recordingInfoList) { + public void sendTvRecordingInfoList(@NonNull List recordingInfoList) { if (DEBUG) { Log.d(TAG, "sendTvRecordingInfoList"); }