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

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

Change-Id: Idf1cfa25c86c2acaa113c4902b305dc634bf5123
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:34:13 +00:00
committed by Automerger Merge Worker

View File

@@ -210,19 +210,19 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont
@Override @Override
public void setBackToLauncherCallback(IOnBackInvokedCallback callback) { public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {
executeRemoteCallWithTaskPermission(mController, "setBackToLauncherCallback", executeRemoteCallWithTaskPermission(mController, "setBackToLauncherCallback",
(controller) -> mController.setBackToLauncherCallback(callback)); (controller) -> controller.setBackToLauncherCallback(callback));
} }
@Override @Override
public void clearBackToLauncherCallback() { public void clearBackToLauncherCallback() {
executeRemoteCallWithTaskPermission(mController, "clearBackToLauncherCallback", executeRemoteCallWithTaskPermission(mController, "clearBackToLauncherCallback",
(controller) -> mController.clearBackToLauncherCallback()); (controller) -> controller.clearBackToLauncherCallback());
} }
@Override @Override
public void onBackToLauncherAnimationFinished() { public void onBackToLauncherAnimationFinished() {
executeRemoteCallWithTaskPermission(mController, "onBackToLauncherAnimationFinished", executeRemoteCallWithTaskPermission(mController, "onBackToLauncherAnimationFinished",
(controller) -> mController.onBackToLauncherAnimationFinished()); (controller) -> controller.onBackToLauncherAnimationFinished());
} }
void invalidate() { void invalidate() {