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

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

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

View File

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