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

Commit 615c7628 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand" into nyc-dev am: 822ac774 

am: bf0db2e9

* commit 'bf0db2e9':
  TIF: Unhide sendAppPrivateCommand/onAppPrivateCommand
parents 5c00ce39 bf0db2e9

api/current.txt

+4 −0
Original line number Diff line number Diff line
@@ -23094,6 +23094,7 @@ package android.media.tv { 
    method public void notifyError(int);

    method public void notifyRecordingStopped(android.net.Uri);

    method public void notifyTuned(android.net.Uri);

    method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public abstract void onRelease();

    method public abstract void onStartRecording(android.net.Uri);

    method public abstract void onStopRecording();
@@ -23111,6 +23112,7 @@ package android.media.tv { 
    method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);

    method public void notifyVideoAvailable();

    method public void notifyVideoUnavailable(int);

    method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public android.view.View onCreateOverlayView();

    method public boolean onGenericMotionEvent(android.view.MotionEvent);

    method public boolean onKeyDown(int, android.view.KeyEvent);
@@ -23142,6 +23144,7 @@ package android.media.tv { 
  public class TvRecordingClient {

    ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);

    method public void release();

    method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public void startRecording(android.net.Uri);

    method public void stopRecording();

    method public void tune(java.lang.String, android.net.Uri);
@@ -23203,6 +23206,7 @@ package android.media.tv { 
    method public boolean onUnhandledInputEvent(android.view.InputEvent);

    method public void reset();

    method public void selectTrack(int, java.lang.String);

    method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public void setCallback(android.media.tv.TvView.TvInputCallback);

    method public void setCaptionEnabled(boolean);

    method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);

api/test-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -23160,6 +23160,7 @@ package android.media.tv { 
    method public void notifyError(int);

    method public void notifyRecordingStopped(android.net.Uri);

    method public void notifyTuned(android.net.Uri);

    method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public abstract void onRelease();

    method public abstract void onStartRecording(android.net.Uri);

    method public abstract void onStopRecording();
@@ -23177,6 +23178,7 @@ package android.media.tv { 
    method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);

    method public void notifyVideoAvailable();

    method public void notifyVideoUnavailable(int);

    method public void onAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public android.view.View onCreateOverlayView();

    method public boolean onGenericMotionEvent(android.view.MotionEvent);

    method public boolean onKeyDown(int, android.view.KeyEvent);
@@ -23208,6 +23210,7 @@ package android.media.tv { 
  public class TvRecordingClient {

    ctor public TvRecordingClient(android.content.Context, java.lang.String, android.media.tv.TvRecordingClient.RecordingCallback, android.os.Handler);

    method public void release();

    method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public void startRecording(android.net.Uri);

    method public void stopRecording();

    method public void tune(java.lang.String, android.net.Uri);
@@ -23269,6 +23272,7 @@ package android.media.tv { 
    method public boolean onUnhandledInputEvent(android.view.InputEvent);

    method public void reset();

    method public void selectTrack(int, java.lang.String);

    method public void sendAppPrivateCommand(java.lang.String, android.os.Bundle);

    method public void setCallback(android.media.tv.TvView.TvInputCallback);

    method public void setCaptionEnabled(boolean);

    method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);

media/java/android/media/tv/TvInputService.java

+0 −4
Original line number Diff line number Diff line
@@ -904,9 +904,7 @@ public abstract class TvInputService extends Service { 
         *            i.e. prefixed with a package name you own, so that different developers will

         *            not create conflicting commands.

         * @param data Any data to include with the command.

         * @hide

         */

        @SystemApi

        public void onAppPrivateCommand(@NonNull String action, Bundle data) {

        }
@@ -1755,9 +1753,7 @@ public abstract class TvInputService extends Service { 
         *            i.e. prefixed with a package name you own, so that different developers will

         *            not create conflicting commands.

         * @param data Any data to include with the command.

         * @hide

         */

        @SystemApi

        public void onAppPrivateCommand(@NonNull String action, Bundle data) {

        }

media/java/android/media/tv/TvRecordingClient.java

+2 −4
Original line number Diff line number Diff line
@@ -200,16 +200,14 @@ public class TvRecordingClient { 
    }



    /**

     * Calls {@link TvInputService.RecordingSession#appPrivateCommand(String, Bundle)} for the

     * current recording session.

     * Sends a private command to the underlying TV input. This can be used to provide

     * domain-specific features that are only known between certain clients and their TV inputs.

     *

     * @param action The name of the private command to send. This <em>must</em> be a scoped name,

     *            i.e. prefixed with a package name you own, so that different developers will not

     *            create conflicting commands.

     * @param data An optional bundle to send with the command.

     * @hide

     */

    @SystemApi

    public void sendAppPrivateCommand(@NonNull String action, Bundle data) {

        if (TextUtils.isEmpty(action)) {

            throw new IllegalArgumentException("action cannot be null or an empty string");

media/java/android/media/tv/TvView.java

+3 −5
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ public class TvView extends ViewGroup { 


    /**

     * Tunes to a given channel. This can be used to provide domain-specific features that are only

     * known between certain TvView applications and their TV inputs.

     * known between certain clients and their TV inputs.

     *

     * @param inputId The ID of TV input for the given channel.

     * @param channelUri The URI of a channel.
@@ -550,16 +550,14 @@ public class TvView extends ViewGroup { 
    }



    /**

     * Calls {@link TvInputService.Session#onAppPrivateCommand(String, Bundle)} for the current

     * session.

     * Sends a private command to the underlying TV input. This can be used to provide

     * domain-specific features that are only known between certain clients and their TV inputs.

     *

     * @param action The name of the private command to send. This <em>must</em> be a scoped name,

     *            i.e. prefixed with a package name you own, so that different developers will not

     *            create conflicting commands.

     * @param data An optional bundle to send with the command.

     * @hide

     */

    @SystemApi

    public void sendAppPrivateCommand(@NonNull String action, Bundle data) {

        if (TextUtils.isEmpty(action)) {

            throw new IllegalArgumentException("action cannot be null or an empty string");