From e922f49b627912c113250bd8506830bb69943025 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Fri, 15 May 2015 14:53:03 -0700
Subject: [PATCH] Allow getChangingConfigurations() on DrawableWrapper with
 null drawable

Change-Id: Iecf39b53419e07927a3fe3096036a57afd69439a
---
 graphics/java/android/graphics/drawable/DrawableWrapper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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() {