Allow getChangingConfigurations() on DrawableWrapper with null drawable

Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
2015-05-15 14:53:03 -07:00
parent afabc21722
commit e922f49b62
1 changed files with 2 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/DrawableWrapper.java
+++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java
@@ -432,7 +432,8 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb

        @Override
        public int getChangingConfigurations() {
-            return mChangingConfigurations | mDrawableState.getChangingConfigurations();
+            return mChangingConfigurations
+                    | (mDrawableState != null ? mDrawableState.getChangingConfigurations() : 0);
        }

        public boolean canConstantState() {