diff options
| author | Alan Viverette <alanv@google.com> | 2014-06-04 18:43:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 18:43:23 +0000 |
| commit | 8a3e0a5c0b9ec620e69bcba40a419eca74cd0e6c (patch) | |
| tree | 293fddf0ad9d0f11c477f7d4f04977431f001fc3 /graphics | |
| parent | 22b893fde125ea6620563c91aab7a28dd68a1f73 (diff) | |
| parent | a48e7b5500d38320592cec034619323781112401 (diff) | |
| download | frameworks_base-8a3e0a5c0b9ec620e69bcba40a419eca74cd0e6c.zip frameworks_base-8a3e0a5c0b9ec620e69bcba40a419eca74cd0e6c.tar.gz frameworks_base-8a3e0a5c0b9ec620e69bcba40a419eca74cd0e6c.tar.bz2 | |
am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
Fix build, fix Drawable loop
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/Drawable.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index f29b9f0..76dd1c8 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -908,7 +908,7 @@ public abstract class Drawable { InputStream is, String srcName) { Trace.traceBegin(Trace.TRACE_TAG_RESOURCES, srcName != null ? srcName : "Unknown drawable"); try { - return createFromResourceStream(res, value, is, srcName); + return createFromResourceStream(res, value, is, srcName, null); } finally { Trace.traceEnd(Trace.TRACE_TAG_RESOURCES); } |