Merge "Remove overzealous mutate() sanity check in LayerDrawable" into jb-mr1.1-dev

This commit is contained in:
Adam Powell
2012-11-28 11:27:09 -08:00
committed by Android (Google) Code Review

View File

@@ -575,10 +575,6 @@ 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;