commit 3e7b61b0944b88bd60308b5fe8bc491408feb4b3
author Evan Rosky <erosky@google.com> Sat Apr 24 01:29:42 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Apr 24 01:29:42 2021 +0000
tree e6f66f938574800626a3a2787b6096d7728442f1
parent 5caf5e66eca91df8a039952f3aa156bbdc9aaa38
parent 2df75d388f569883bf3eb06e6f08176b75c0b32a

Merge "Fix surface release race when using Shell Transitions" into sc-dev

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;
         }