commit d42212885a8685b267669d43db505b214f9b5ac7
author Lucas Dupin <dupin@google.com> Thu Feb 15 22:41:33 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 22:41:33 2018 +0000
tree 577d9b33abf97119473a83d8446d6d34200aea5b
parent f6965c9c0f6edb210ce7d292d31b91df47d36e61
parent bf4646bf1f774ae47756985d862f7ce73844a830

Merge "Fix race condition in GradientDrawable"

core/java/com/android/internal/colorextraction/drawable/GradientDrawable.java

diff --git a/core/java/com/android/internal/colorextraction/drawable/GradientDrawable.java b/core/java/com/android/internal/colorextraction/drawable/GradientDrawable.java
index 500c028..bf151c3 100644
--- a/core/java/com/android/internal/colorextraction/drawable/GradientDrawable.java
+++ b/core/java/com/android/internal/colorextraction/drawable/GradientDrawable.java
@@ -57,6 +57,8 @@
     private int mMainColor;
     private int mSecondaryColor;
     private ValueAnimator mColorAnimation;
+    private int mMainColorTo;
+    private int mSecondaryColorTo;
 
     public GradientDrawable(@NonNull Context context) {
         mDensity = context.getResources().getDisplayMetrics().density;
@@ -76,7 +78,7 @@
     }
 
     public void setColors(int mainColor, int secondaryColor, boolean animated) {
-        if (mainColor == mMainColor && secondaryColor == mSecondaryColor) {
+        if (mainColor == mMainColorTo && secondaryColor == mSecondaryColorTo) {
             return;
         }
 
@@ -84,6 +86,9 @@
             mColorAnimation.cancel();
         }
 
+        mMainColorTo = mainColor;
+        mSecondaryColorTo = mainColor;
+
         if (animated) {
             final int mainFrom = mMainColor;
             final int secFrom = mSecondaryColor;