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

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

Merge "Unhide notifyRecordingStopped API"

parents 793b4f4e 99b68481

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -26785,6 +26785,7 @@ package android.media.tv.interactive { 
    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 void onRecordingStopped(@NonNull String);

    method public abstract void onRelease();

    method public void onResetInteractiveApp();

    method public abstract boolean onSetSurface(@Nullable android.view.Surface);
@@ -26843,6 +26844,7 @@ package android.media.tv.interactive { 
    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 notifyRecordingStopped(@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/TvInteractiveAppService.java

+6 −4
Original line number Diff line number Diff line
@@ -457,7 +457,9 @@ public abstract class TvInteractiveAppService extends Service { 
        /**

         * Receives started recording's ID.

         *

         * @param recordingId The ID of the recording started

         * @param recordingId The ID of the recording started. The TV app should provide and

         *                    maintain this ID to identify the recording in the future.

         * @see #onRecordingStopped(String)

         */

        public void onRecordingStarted(@NonNull String recordingId) {

        }
@@ -465,13 +467,13 @@ public abstract class TvInteractiveAppService extends Service { 
        /**

         * Receives stopped recording's ID.

         *

         * @param recordingId The ID of the recording stopped

         * @hide

         * @param recordingId The ID of the recording stopped. This ID is created and maintained by

         *                    the TV app when the recording was started.

         * @see #onRecordingStarted(String)

         */

        public void onRecordingStopped(@NonNull String recordingId) {

        }





        /**

         * Receives signing result.

         * @param signingId the ID to identify the request. It's the same as the corresponding ID in

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

+1 −1
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ public class TvInteractiveAppView extends ViewGroup { 
     *

     * @param recordingId The ID of the recording started. This ID is created and maintained by the

     *                    TV app and is used to identify the recording in the future.

     * @see TvInteractiveAppView#notifyRecordingStopped(String)

     */

    public void notifyRecordingStarted(@NonNull String recordingId) {

        if (DEBUG) {
@@ -601,7 +602,6 @@ public class TvInteractiveAppView extends ViewGroup { 
     * @param recordingId The ID of the recording stopped. This ID is created and maintained

     *                    by the TV app when a recording is started.

     * @see TvInteractiveAppView#notifyRecordingStarted(String)

     * @hide

     */

    public void notifyRecordingStopped(@NonNull String recordingId) {

        if (DEBUG) {