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

Commit b2e0cb0e authored by Yu-Ting Tseng's avatar Yu-Ting Tseng Committed by Automerger Merge Worker
Browse files

Merge changes I47a60bd0,Ib777d992,Iba5b9c9e into main am: 095d9148 

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



Change-Id: Ib33a09619237ad3247050bb2d7cee8f3af8b0dec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d490e4d 095d9148

core/java/android/os/RemoteCallbackList.java

+16 −4
Original line number Diff line number Diff line
@@ -194,15 +194,27 @@ public class RemoteCallbackList<E extends IInterface> { 
            }

        }



        public void maybeSubscribeToFrozenCallback() throws RemoteException {

        void maybeSubscribeToFrozenCallback() throws RemoteException {

            if (mFrozenCalleePolicy != FROZEN_CALLEE_POLICY_UNSET) {

                try {

                    mBinder.addFrozenStateChangeCallback(this);

                } catch (UnsupportedOperationException e) {

                    // The kernel does not support frozen notifications. In this case we want to

                    // silently fall back to FROZEN_CALLEE_POLICY_UNSET. This is done by simply

                    // ignoring the error and moving on. mCurrentState would always be

                    // STATE_UNFROZEN and all callbacks are invoked immediately.

                }

            }

        }



        public void maybeUnsubscribeFromFrozenCallback() {

        void maybeUnsubscribeFromFrozenCallback() {

            if (mFrozenCalleePolicy != FROZEN_CALLEE_POLICY_UNSET) {

                try {

                    mBinder.removeFrozenStateChangeCallback(this);

                } catch (UnsupportedOperationException e) {

                    // The kernel does not support frozen notifications. Ignore the error and move

                    // on.

                }

            }

        }