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

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

Merge "Unhide sendTvRecordingInfoList"

parents 4ce2789c 70db6e9b

core/api/current.txt

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

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

+5 −5
Original line number Diff line number Diff line
@@ -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.

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

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

        }