commit c5d52ad77fd269373aca384d2c94cb3de44bf711
author Selim Cinek <cinek@google.com> Mon May 18 11:27:32 2020 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Mon May 18 23:17:21 2020 +0000
tree fdcf43d28f01676312f718b9b18fd2cd2c048db8
parent 2f70af1ead8debd77ae15d79ed375c0f64614f13

Fixed a bug where the brighness mirror would make everything invisible

Because of some new animation optimization, this could lead to issues
where we weren't cancelling the animation in one side case.

Fixes: 156569031
Test: tap on brightness mirror, observe
Change-Id: I18164b16a612431f8b3ec87a5b5834c0f48dd761
(cherry picked from commit 7d9d378b283c03d8ccc5f35d1f18424ab36549e7)

packages/SystemUI/src/com/android/systemui/statusbar/notification/PropertyAnimator.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/PropertyAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/PropertyAnimator.java
index b1b6a1c..3517e24 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/PropertyAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/PropertyAnimator.java
@@ -92,6 +92,9 @@
         AnimatorListenerAdapter listener = properties.getAnimationFinishListener(property);
         if (currentValue.equals(newEndValue)) {
             // Skip the animation!
+            if (previousAnimator != null) {
+                previousAnimator.cancel();
+            }
             if (listener != null) {
                 listener.onAnimationEnd(null);
             }