Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unhide sendTvRecordingInfoList"

Browse Source
This commit is contained in:
David Zhao
2023-02-01 05:17:28 +00:00
committed by Android (Google) Code Review
parent 4ce2789ce7 70db6e9b47
commit d20313c4a5
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -27422,6 +27422,7 @@ package android.media.tv.interactive {
method public void onTracksChanged(@NonNull java.util.List<android.media.tv.TvTrackInfo>);
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<android.media.tv.TvRecordingInfo>);
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<android.media.tv.TvTrackInfo>);
method public void sendTvRecordingInfo(@Nullable android.media.tv.TvRecordingInfo);
method public void sendTvRecordingInfoList(@NonNull java.util.List<android.media.tv.TvRecordingInfo>);
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);

10
media/java/android/media/tv/interactive/TvInteractiveAppService.java
View File

@@ -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<TvRecordingInfo> recordingInfoList) {
}
public void onTvRecordingInfoList(@NonNull List<TvRecordingInfo> recordingInfoList) {}
/**
* Receives started recording's ID.

7
media/java/android/media/tv/interactive/TvInteractiveAppView.java
View File

@@ -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<TvRecordingInfo> recordingInfoList) {
public void sendTvRecordingInfoList(@NonNull List<TvRecordingInfo> recordingInfoList) {
if (DEBUG) {
Log.d(TAG, "sendTvRecordingInfoList");
}