commit 923f93eb258f6accc1dc66f417c2044e6fb9492e
author Winson Chung <winsonc@google.com> Thu May 13 17:31:49 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 13 17:31:49 2021 +0000
tree c511d42ae012e735f35561078a347f972c800f67
parent 9c8ba573b929c23569efc94b59fe5f265db214ec
parent 549ea0b3a993b571bdd3f50780afb2bd5c0be16d

Merge "Skip setting up ui if the handler is already invalidated" into sc-dev am: 549ea0b3a9

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

Change-Id: Idfd4c3637568ab01338542e29a7d67637f2a6348

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index afe989d..99ac32a 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1520,6 +1520,9 @@
     protected abstract void finishRecentsControllerToHome(Runnable callback);
 
     private void setupLauncherUiAfterSwipeUpToRecentsAnimation() {
+        if (mStateCallback.hasStates(STATE_HANDLER_INVALIDATED)) {
+            return;
+        }
         endLauncherTransitionController();
         mRecentsView.onSwipeUpAnimationSuccess();
         if (LIVE_TILE.get()) {

quickstep/src/com/android/quickstep/TaskAnimationManager.java

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index 44a3e95..e90a1ab 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -57,6 +57,11 @@
         @Override
         public void onActivityRestartAttempt(ActivityManager.RunningTaskInfo task,
                 boolean homeTaskVisible, boolean clearedTask, boolean wasVisible) {
+            if (mLastGestureState == null) {
+                ActivityManagerWrapper.getInstance().unregisterTaskStackListener(
+                        mLiveTileRestartListener);
+                return;
+            }
             BaseActivityInterface activityInterface = mLastGestureState.getActivityInterface();
             if (LIVE_TILE.get() && activityInterface.isInLiveTileMode()
                     && activityInterface.getCreatedActivity() != null) {