commit bb53dad63b4a1da04b01cdc9f4b0a98b7623a824
author Adam Powell <adamp@google.com> Tue Nov 27 11:39:11 2012 -0800
committer Adam Powell <adamp@google.com> Tue Nov 27 11:39:11 2012 -0800
tree 834b9e4c1f03e5fc39b0aac0ab498ebafe614a42
parent ba4ac51823c59152e2167365b81ac56857b6b4d0

Remove overzealous mutate() sanity check in LayerDrawable

Child drawables of a LayerDrawable should be able to mutate() as a
no-op even if they !canConstantState.

Bug 7622311

Change-Id: I32c00961310f23aaf9ad868c419cbefb9d27a1d2

graphics/java/android/graphics/drawable/LayerDrawable.java

diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java
index 0351b71..dd692c6 100644
--- a/graphics/java/android/graphics/drawable/LayerDrawable.java
+++ b/graphics/java/android/graphics/drawable/LayerDrawable.java
@@ -575,10 +575,6 @@
     @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;