Merge "Fix that CSL cache hits produce bad drawables" into sc-dev (3aa5a8fb) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/ColorStateListDrawable.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -48,6 +48,12 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
		setColorStateList(colorStateList);
		}

		private ColorStateListDrawable(@NonNull ColorStateListDrawableState state) {
		mState = state;
		initializeColorDrawable();
		onStateChange(getState());
		}

		@Override
		public void draw(@NonNull Canvas canvas) {
		mColorDrawable.draw(canvas);
		@@ -286,11 +292,6 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac
		}
		}

		private ColorStateListDrawable(@NonNull ColorStateListDrawableState state) {
		mState = state;
		initializeColorDrawable();
		}

		private void initializeColorDrawable() {
		mColorDrawable = new ColorDrawable();
		mColorDrawable.setCallback(this);