diff options
| author | 2022-06-08 16:14:17 +0000 | |
|---|---|---|
| committer | 2022-06-08 16:14:17 +0000 | |
| commit | 12e973c5aba34347b30531fbcc4ea9faa627300c (patch) | |
| tree | e1e1ddbce0bfd12e10667a8ef58ed0ca4d6041c0 | |
| parent | 9868ad95059883fa8583ddded0b9be222540c45c (diff) | |
| parent | a671783048d7b7836f4a79afd91d052811bf2e53 (diff) | |
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: I400ff9c0baa2fb8bd438faa03accca69e135d9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java index 7760df17a8cd..0cb56d72004d 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java @@ -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() { |