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

Commit 39b03322 authored by Shan Huang's avatar Shan Huang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into... 

Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into tm-dev am: a6717830 am: 12e973c5

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



Change-Id: I171055c37e2ffe7ab08470a567dfb33c53722f37
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b204df06 12e973c5

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+3 −3
Original line number Diff line number Diff line
@@ -210,19 +210,19 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        @Override

        public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {

            executeRemoteCallWithTaskPermission(mController, "setBackToLauncherCallback",

                    (controller) -> mController.setBackToLauncherCallback(callback));

                    (controller) -> controller.setBackToLauncherCallback(callback));

        }



        @Override

        public void clearBackToLauncherCallback() {

            executeRemoteCallWithTaskPermission(mController, "clearBackToLauncherCallback",

                    (controller) -> mController.clearBackToLauncherCallback());

                    (controller) -> controller.clearBackToLauncherCallback());

        }



        @Override

        public void onBackToLauncherAnimationFinished() {

            executeRemoteCallWithTaskPermission(mController, "onBackToLauncherAnimationFinished",

                    (controller) -> mController.onBackToLauncherAnimationFinished());

                    (controller) -> controller.onBackToLauncherAnimationFinished());

        }



        void invalidate() {