Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ce2789c authored by David Zhao's avatar David Zhao Committed by Android (Google) Code Review
Browse files

Merge "Unhide sendTvRecordingInfo"

parents 741f37a9 1c640b95

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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);

media/java/android/media/tv/interactive/TvInteractiveAppService.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {

        }

media/java/android/media/tv/interactive/TvInteractiveAppView.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {