commit af0d6d26d172716e31f3ea7a12169ea39ac8e905
author Jorim Jaggi <jjaggi@google.com> Fri Jun 08 15:25:35 2018 +0200
committer Jorim Jaggi <jjaggi@google.com> Mon Jun 18 15:56:34 2018 +0200
tree 6848e2c6d194bd5f95f52993252c9423cff90239
parent 42fb737d139697802d6213c6d4d568acd6c746fb

Prevent showing windows while animating to avoid color mode switch

If we switch the color mode during a transition, it's pretty much
guaranteed that SF is going to jank. To work around that, we
disallow showing the real content while an activity with a
non-standard-color mode is animating.

Test: Reopen photos, observe no jank
Bug: 79878256
Change-Id: Id27db483844d9424ccfb9afdebd31325eae0cdd8

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index cfbcd17..47dbccb 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -404,7 +404,7 @@
         WindowStateAnimator winAnimator = w.mWinAnimator;
         final AppWindowToken atoken = w.mAppToken;
         if (winAnimator.mDrawState == READY_TO_SHOW) {
-            if (atoken == null || atoken.allDrawn) {
+            if (atoken == null || atoken.canShowWindows()) {
                 if (w.performShowLocked()) {
                     pendingLayoutChanges |= FINISH_LAYOUT_REDO_ANIM;
                     if (DEBUG_LAYOUT_REPEATS) {