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

Merge "Unhide sendTvRecordingInfo"

Browse Source
This commit is contained in:
David Zhao
2023-02-01 05:17:02 +00:00
committed by Android (Google) Code Review
parent 741f37a9f1 1c640b9548
commit 4ce2789ce7
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -27421,6 +27421,7 @@ package android.media.tv.interactive {
method public boolean onTrackballEvent(@NonNull android.view.MotionEvent);
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 onVideoAvailable();
method public void onVideoUnavailable(int);
method @CallSuper public void removeBroadcastInfo(int);
@@ -27483,6 +27484,7 @@ package android.media.tv.interactive {
method public void sendSigningResult(@NonNull String, @NonNull byte[]);
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 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);

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

@@ -606,10 +606,10 @@ public abstract class TvInteractiveAppService extends Service {
}
/**
* Receives requested recording info.
* Receives the requested {@link android.media.tv.TvRecordingInfo}.
*
* @param recordingInfo The requested recording info. Null if recording not found.
* @hide
* @see #requestTvRecordingInfo(String)
* @param recordingInfo The requested recording info. {@code null} if no recording found.
*/
public void onTvRecordingInfo(@Nullable TvRecordingInfo recordingInfo) {
}

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

@@ -635,8 +635,8 @@ public class TvInteractiveAppView extends ViewGroup {
/**
* Sends the requested {@link android.media.tv.TvRecordingInfo}.
*
* @param recordingInfo The recording info requested {@code null} if no recording found.
* @hide
* @see TvInteractiveAppService.Session#requestTvRecordingInfo(String)
* @param recordingInfo The recording info requested. {@code null} if no recording found.
*/
public void sendTvRecordingInfo(@Nullable TvRecordingInfo recordingInfo) {
if (DEBUG) {