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

Commit 9c0996d3 authored by Shan Huang's avatar Shan Huang
Browse files

Fix NPE from BackAnimationController#setBackToLauncherCallback. 

Bug: 235198537
Test: atest BackAnimationControllerTest
Change-Id: Ibb0e85ab3cb62cc4d1ab1a2da5e6f4b2a5d9e90f
parent 1f9afd72

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() {