commit 6f007dfc46cf486e61efd924e93ed7344eb4e0c7
author chaviw <chaviw@google.com> Fri Feb 09 14:36:10 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Mon Feb 12 22:36:46 2018 +0000
tree b91b7cfee0218c01be296214a3883b2bc87df83a
parent 15cf65cd5f9e29c4e8cbd53309aabd85d8c45f6a

Prevent setting negative alpha for dim animations.

When apply in the dim animation is called, the currentPlayTime value can
be greater than the total duration. If that's the case, the alpha
value would be set to a negative value. Instead, if the currentPlayTime is
greater than duration, just set the final alpha value.

Change-Id: I77b7c512cc8832c2a31e20d49c14550da2cff7cd
Fixes: 73152600
Test: No more flashing dim
(cherry picked from commit 4d133725d4b263018555cbba99bb3a2524508707)

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

diff --git a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
index 1b2f954..98fcb0b 100644
--- a/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
+++ b/services/core/java/com/android/server/wm/SurfaceAnimationRunner.java
@@ -169,7 +169,12 @@
         anim.addUpdateListener(animation -> {
             synchronized (mCancelLock) {
                 if (!a.mCancelled) {
-                    applyTransformation(a, mFrameTransaction, anim.getCurrentPlayTime());
+                    final long duration = anim.getDuration();
+                    long currentPlayTime = anim.getCurrentPlayTime();
+                    if (currentPlayTime > duration) {
+                        currentPlayTime = duration;
+                    }
+                    applyTransformation(a, mFrameTransaction, currentPlayTime);
                 }
             }