commit a1762666518aa6ca521c591ac28c0f0814ca97a9
author Vishnu Nair <vishnun@google.com> Thu Dec 10 21:55:03 2020 +0000
committer Vishnu Nair <vishnun@google.com> Thu Dec 10 21:56:58 2020 +0000
tree 714dfc7df1785008bd7fb6b542e7ba0cf82ed9d1
parent 98434ff9119cde822d10626998de5894bb97046c

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

This fixes a flicker introduced by 88fbccf which may incorrectly apply
the display content's pending transaction instead of the task's.

Test: go/wm-smoke
Test: app to recents, see no flicker
Change-Id: If0a0431b2ea170ea833c1445599f0fdb9431dabf

services/core/java/com/android/server/wm/RecentsAnimationController.java

diff --git a/services/core/java/com/android/server/wm/RecentsAnimationController.java b/services/core/java/com/android/server/wm/RecentsAnimationController.java
index 128c259..40315f9 100644
--- a/services/core/java/com/android/server/wm/RecentsAnimationController.java
+++ b/services/core/java/com/android/server/wm/RecentsAnimationController.java
@@ -996,7 +996,7 @@
                         .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();