Merge "Fix NPE from BackAnimationController#setBackToLauncherCallback." into tm-dev am: a671783048 am: 12e973c5ab am: 39b033229e am: 5f3103d027

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

Change-Id: I865ceb504144f18517272e02b659f4da9ade8915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shan Huang
2022-06-08 17:09:09 +00:00
committed by Automerger Merge Worker

View File

@@ -214,19 +214,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() {