commit 4be5acc273594eef7dbfe44f2e0961a24f78dec4
author Shan Huang <shanh@google.com> Mon Mar 14 17:02:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 14 17:02:50 2022 +0000
tree c4a2f36a9025073e94d78cbc35ee8a5b3b337421
parent 9142cd1aa293433aa144b838cec663a7550a03a4
parent b6ff87bb997618224733bb6ac22e4ef2a113224b

Merge "Clear back callback in SystemUiProxy." into tm-dev am: b6ff87bb99

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17169107

Change-Id: Ie4c9579e315c5add2531d85c1f971ba56f05f622

quickstep/src/com/android/quickstep/SystemUiProxy.java

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index d8cbd36..5ef89d3 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -99,7 +99,7 @@
     private ILauncherUnlockAnimationController mPendingLauncherUnlockAnimationController;
     private IRecentTasksListener mRecentTasksListener;
     private final ArrayList<RemoteTransitionCompat> mRemoteTransitions = new ArrayList<>();
-    private IOnBackInvokedCallback mBackToLaunchCallback;
+    private IOnBackInvokedCallback mBackToLauncherCallback;
 
     // Used to dedupe calls to SystemUI
     private int mLastShelfHeight;
@@ -200,8 +200,8 @@
         if (mRecentTasksListener != null && mRecentTasks != null) {
             registerRecentTasksListener(mRecentTasksListener);
         }
-        if (mBackAnimation != null && mBackToLaunchCallback != null) {
-            setBackToLauncherCallback(mBackToLaunchCallback);
+        if (mBackAnimation != null && mBackToLauncherCallback != null) {
+            setBackToLauncherCallback(mBackToLauncherCallback);
         }
 
         if (mPendingSetNavButtonAlpha != null) {
@@ -836,7 +836,7 @@
 
     /** Sets the launcher {@link android.window.IOnBackInvokedCallback} to shell */
     public void setBackToLauncherCallback(IOnBackInvokedCallback callback) {
-        mBackToLaunchCallback = callback;
+        mBackToLauncherCallback = callback;
         if (mBackAnimation == null) {
             return;
         }
@@ -849,6 +849,7 @@
 
     /** Clears the previously registered {@link IOnBackInvokedCallback}. */
     public void clearBackToLauncherCallback() {
+        mBackToLauncherCallback = null;
         if (mBackAnimation == null) {
             return;
         }