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

2021-04-24 01:29:42 +00:00
parent 5caf5e66ec 2df75d388f
commit 3e7b61b094
1 changed files with 6 additions and 0 deletions
@@ -17,6 +17,8 @@ package com.android.quickstep;

 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 class RemoteAnimationTargets {
    }

    public void release() {
+        if (ENABLE_SHELL_TRANSITIONS) {
+            mReleaseChecks.clear();
+            return;
+        }
        if (mReleased) {
            return;
        }