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

Commit a6717830 authored by Shan Huang's avatar Shan Huang Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into tm-dev

parents 94c91a89 9c0996d3

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