Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix LayerDrawable#mutate"

Browse Source
This commit is contained in:
Adam Powell
2012-03-21 14:56:10 -07:00
committed by Android (Google) Code Review
parent 9a69fea81d 26e35fca60
commit 63b9e973e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/java/android/graphics/drawable/LayerDrawable.java
View File

@@ -575,6 +575,11 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
@Override
public Drawable mutate() {
if (!mMutated && super.mutate() == this) {
if (!mLayerState.canConstantState()) {
throw new IllegalStateException("One or more children of this LayerDrawable does " +
"not have constant state; this drawable cannot be mutated.");
}
mLayerState = new LayerState(mLayerState, this, null);
final ChildDrawable[] array = mLayerState.mChildren;
final int N = mLayerState.mNum;
for (int i = 0; i < N; i++) {
@@ -694,7 +699,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback {
return stateful;
}
public synchronized boolean canConstantState() {
public boolean canConstantState() {
if (!mCheckedConstantState && mChildren != null) {
mCanConstantState = true;
final int N = mNum;