diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java
index 0da4275faba71..bd8eae0168074 100644
--- 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() {