| commit | 25242a7bbc5738f5a1fc85499e229f849b796bcf | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Wed Jun 29 17:01:21 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 29 17:01:21 2016 +0000 |
| tree | bb8b82b4fbd1db7d4ff824ba41044dfa52376423 | |
| parent | a3fc533d77bb8c12913953bb78849c548a437a3c [diff] | |
| parent | f66bdf9b577f93485529af7bfe45f3a62a64e950 [diff] |
Merge \"Disable constant state sharing for VectorDrawable\" into nyc-dev am: f66bdf9b57 Change-Id: I0c6397987d926c35cb5486fd9d2cb22efb8d8f14
diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index a8c8737..c34f474 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java
@@ -243,7 +243,9 @@ * 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); }