commit 45ecd544a76456bebe5cae1f75568e171040e4ae
author Evan Rosky <erosky@google.com> Sat Apr 24 01:37:33 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 24 01:37:33 2021 +0000
tree 4c7c3fab84bc062271c214059809f94ce0a750c0
parent 57020bc8a7eee5080a8eff421f8bbbc92665cb45
parent 3e7b61b0944b88bd60308b5fe8bc491408feb4b3

Merge "Fix surface release race when using Shell Transitions" into sc-dev am: 3e7b61b094

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

Change-Id: Iedac273fbf83ab1108f63112767c9a655b45048c

quickstep/src/com/android/quickstep/RemoteAnimationTargets.java

diff --git a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
index a1af77d..edc3ab2 100644
--- a/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
+++ b/quickstep/src/com/android/quickstep/RemoteAnimationTargets.java
@@ -17,6 +17,8 @@
 
 import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;
 
+import static com.android.quickstep.TaskAnimationManager.ENABLE_SHELL_TRANSITIONS;
+
 import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
 
 import java.util.ArrayList;
@@ -97,6 +99,10 @@
     }
 
     public void release() {
+        if (ENABLE_SHELL_TRANSITIONS) {
+            mReleaseChecks.clear();
+            return;
+        }
         if (mReleased) {
             return;
         }