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

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

Merge "Implement setTvMessageEnabled" into udc-dev am: 84e46f49 

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



Change-Id: I298bc7a82b7f96e86218818d233b8dd4f391344d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 911f34c9 84e46f49

media/java/android/media/tv/ITvInputManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ interface ITvInputManager { 


    // For TV Message

    void notifyTvMessage(in IBinder sessionToken, int type, in Bundle data, int userId);

    void setTvMessageEnabled(in IBinder sessionToken, int type, boolean enabled, int userId);



    // For TV input hardware binding

    List<TvInputHardwareInfo> getHardwareList();

media/java/android/media/tv/ITvInputSession.aidl

+1 −0
Original line number Diff line number Diff line
@@ -79,4 +79,5 @@ oneway interface ITvInputSession { 


    // For TV messages

    void notifyTvMessage(int type, in Bundle data);

    void setTvMessageEnabled(int type, boolean enabled);

}

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

+7 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
            case DO_SET_TV_MESSAGE_ENABLED: {

                SomeArgs args = (SomeArgs) msg.obj;

                mTvInputSessionImpl.setTvMessageEnabled((Integer) args.arg1, (Boolean) args.arg2);

                args.recycle();

                break;

            }

            case DO_REQUEST_AD: {
@@ -474,6 +475,12 @@ public class ITvInputSessionWrapper extends ITvInputSession.Stub implements Hand 
        mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_NOTIFY_TV_MESSAGE, type, data));

    }



    @Override

    public void setTvMessageEnabled(int type, boolean enabled) {

        mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_SET_TV_MESSAGE_ENABLED, type,

                enabled));

    }



    private final class TvInputEventReceiver extends InputEventReceiver {

        TvInputEventReceiver(InputChannel inputChannel, Looper looper) {

            super(inputChannel, looper);

media/java/android/media/tv/TvInputManager.java

+12 −1
Original line number Diff line number Diff line
@@ -3305,7 +3305,7 @@ public final class TvInputManager { 
        /**

         * Sends TV messages to the service for testing purposes

         */

        public void notifyTvMessage(@NonNull @TvMessageType int type, @NonNull Bundle data) {

        public void notifyTvMessage(int type, Bundle data) {

            try {

                mService.notifyTvMessage(mToken, type, data, mUserId);

            } catch (RemoteException e) {
@@ -3313,6 +3313,17 @@ public final class TvInputManager { 
            }

        }



        /**

         * Sets whether the TV message of the specific type should be enabled.

         */

        public void setTvMessageEnabled(int type, boolean enabled) {

            try {

                mService.setTvMessageEnabled(mToken, type, enabled, mUserId);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

        }



        /**

         * Starts TV program recording in the current recording session.

         *

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

+3 −0
Original line number Diff line number Diff line
@@ -745,6 +745,9 @@ public class TvView extends ViewGroup { 
     */

    public void setTvMessageEnabled(@TvInputManager.TvMessageType int type,

            boolean enabled) {

        if (mSession != null) {

            mSession.setTvMessageEnabled(type, enabled);

        }

    }



    @Override