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

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

Merge "Unhide notifyRecordingStarted API"

parents 1a77f087 c555dd01

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -26541,6 +26541,7 @@ package android.media.tv.interactive { 
    method public boolean onKeyMultiple(int, int, @NonNull android.view.KeyEvent);

    method public boolean onKeyUp(int, @NonNull android.view.KeyEvent);

    method public void onMediaViewSizeChanged(@Px int, @Px int);

    method public void onRecordingStarted(@NonNull String);

    method public abstract void onRelease();

    method public void onResetInteractiveApp();

    method public abstract boolean onSetSurface(@Nullable android.view.Surface);
@@ -26598,6 +26599,7 @@ package android.media.tv.interactive { 
    method public boolean dispatchUnhandledInputEvent(@NonNull android.view.InputEvent);

    method @Nullable public android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener getOnUnhandledInputEventListener();

    method public void notifyError(@NonNull String, @NonNull android.os.Bundle);

    method public void notifyRecordingStarted(@NonNull String);

    method public void onAttachedToWindow();

    method public void onDetachedFromWindow();

    method public void onLayout(boolean, int, int, int, int);

media/java/android/media/tv/interactive/TvInteractiveAppManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ public final class TvInteractiveAppManager { 
            }

        }



        void notifyRecordingStarted(@Nullable String recordingId) {

        void notifyRecordingStarted(String recordingId) {

            if (mToken == null) {

                Log.w(TAG, "The session has been already released");

                return;

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

+3 −2
Original line number Diff line number Diff line
@@ -456,9 +456,10 @@ public abstract class TvInteractiveAppService extends Service { 


        /**

         * Receives started recording's ID.

         * @hide

         *

         * @param recordingId The ID of the recording started

         */

        public void onRecordingStarted(@Nullable String recordingId) {

        public void onRecordingStarted(@NonNull String recordingId) {

        }



        /**

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

+2 −4
Original line number Diff line number Diff line
@@ -583,11 +583,9 @@ public class TvInteractiveAppView extends ViewGroup { 
    /**

     * Alerts the TV interactive app that a recording has been started with recordingId

     *

     * @param recordingId The Id of the recording started

     *

     * @hide

     * @param recordingId The ID of the recording started

     */

    public void notifyRecordingStarted(@Nullable String recordingId) {

    public void notifyRecordingStarted(@NonNull String recordingId) {

        if (DEBUG) {

            Log.d(TAG, "notifyRecordingStarted");

        }