Merge "Only apply the task's pending transaction if it is detached"

2020-12-11 00:28:16 +00:00
parent ac73ea0c29 a176266651
commit 38535365e8
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -996,7 +996,7 @@ public class RecentsAnimationController implements DeathRecipient {
                        .setWindowCrop(taskSurface, mFinishBounds.width(), mFinishBounds.height())
                        .apply();
                mFinishBounds.setEmpty();
-            } else {
+            } else if (!mTask.isAttached()) {
                // Apply the task's pending transaction in case it is detached and its transaction
                // is not reachable.
                mTask.getPendingTransaction().apply();