Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am: f66bdf9b57

am: 25242a7bbc Change-Id: I20e41c6ebbac82fd70ae3d724e484eac78d2b308
2016-06-29 17:05:36 +00:00
parent 0abc10769d 25242a7bbc
commit edb98d238f
1 changed files with 3 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/VectorDrawable.java
+++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -243,7 +243,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);
    }