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

Commit a1779568 authored by David Zhao's avatar David Zhao Committed by Automerger Merge Worker
Browse files

Merge "Update onTvMessage callback to also be int" into udc-dev am: 9ce369b8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22104767



Change-Id: I80a3c7ec17b815d28b9ddb7c6be229026fb7477a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5a359596 9ce369b8

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -27478,7 +27478,7 @@ package android.media.tv { 
    method public boolean onTrackballEvent(android.view.MotionEvent);

    method public abstract boolean onTune(android.net.Uri);

    method public boolean onTune(android.net.Uri, android.os.Bundle);

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

    method public void onTvMessage(int, @NonNull android.os.Bundle);

    method public void onUnblockContent(android.media.tv.TvContentRating);

    method public void setOverlayViewEnabled(boolean);

  }

media/java/android/media/tv/ITvInputSessionWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
            }

            case DO_NOTIFY_TV_MESSAGE: {

                SomeArgs args = (SomeArgs) msg.obj;

                mTvInputSessionImpl.onTvMessageReceived((String) args.arg1, (Bundle) args.arg2);

                mTvInputSessionImpl.onTvMessageReceived((Integer) args.arg1, (Bundle) args.arg2);

                break;

            }

            default: {

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

+2 −2
Original line number Diff line number Diff line
@@ -1512,7 +1512,7 @@ public abstract class TvInputService extends Service { 
         *             See {@link TvInputManager#TV_MESSAGE_KEY_SUBTYPE} for more information on

         *             how to parse this data.

         */

        public void onTvMessage(@NonNull @TvInputManager.TvMessageType String type,

        public void onTvMessage(@TvInputManager.TvMessageType int type,

                @NonNull Bundle data) {

        }
@@ -2065,7 +2065,7 @@ public abstract class TvInputService extends Service { 
            onAdBufferReady(buffer);

        }



        void onTvMessageReceived(String type, Bundle data) {

        void onTvMessageReceived(int type, Bundle data) {

            onTvMessage(type, data);

        }