2 files changed, 4 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
index c787fb0..8560685 100644
--- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
@@ -208,7 +208,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
                             R.styleable.AnimatedVectorDrawable_drawable, 0);
                     if (drawableRes != 0) {
                         mAnimatedVectorState.mVectorDrawable = (VectorDrawable) res.getDrawable(
-                                drawableRes);
+                                drawableRes, theme);
                     }
                     a.recycle();
                 } else if (TARGET.equals(tagName)) {
@@ -234,7 +234,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable {
     @Override
     public boolean canApplyTheme() {
         return super.canApplyTheme() || mAnimatedVectorState != null
-                && mAnimatedVectorState.canApplyTheme();
+                && mAnimatedVectorState.mVectorDrawable != null
+                && mAnimatedVectorState.mVectorDrawable.canApplyTheme();
     }
 
     @Override
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index c98f2a1..b37204d 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -166,7 +166,7 @@ public class VectorDrawable extends Drawable {
 
     @Override
     public ConstantState getConstantState() {
-        return mVectorState;
+        return null;
     }
 
     @Override