From 1882ce941ba38879733617e7a5734a244d8afaf3 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 29 Jun 2016 11:32:13 -0400
Subject: [PATCH] Disable constant state sharing for VectorDrawable

Bug: 29854240
Change-Id: Icc58d04ad6f471d05b085a9089893e4f7205eb7d
---
 graphics/java/android/graphics/drawable/VectorDrawable.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java
index f5592fa7e4079..7b8dc52bc3b44 100644
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -240,7 +240,9 @@ public class VectorDrawable extends Drawable {
      * constructors to set the state and initialize local properties.
      */
     private VectorDrawable(@NonNull VectorDrawableState state, @Nullable Resources res) {
-        mVectorState = state;
+        // Constant state sharing is disabled until we fix onStateChanged()
+        // affecting the shared bitmap.
+        mVectorState = new VectorDrawableState(state);
         updateLocalState(res);
     }