Merge "Disable constant state sharing for VectorDrawable" into nyc-dev

2016-06-29 16:54:28 +00:00
parent 55427a6650 1882ce941b
commit f66bdf9b57
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
@ -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);
    }