Merge "Fix race condition in GradientDrawable" (d4221288) · Commits · e / os / android_frameworks_base

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,8 @@ public class GradientDrawable extends Drawable {
		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 class GradientDrawable extends Drawable {
		}

		public void setColors(int mainColor, int secondaryColor, boolean animated) {
		if (mainColor == mMainColor && secondaryColor == mSecondaryColor) {
		if (mainColor == mMainColorTo && secondaryColor == mSecondaryColorTo) {
		return;
		}

		@@ -84,6 +86,9 @@ public class GradientDrawable extends Drawable {
		mColorAnimation.cancel();
		}

		mMainColorTo = mainColor;
		mSecondaryColorTo = mainColor;

		if (animated) {
		final int mainFrom = mMainColor;
		final int secFrom = mSecondaryColor;