Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev

Browse Source 
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
  Fix build, fix Drawable loop
This commit is contained in:
Alan Viverette
2014-06-04 18:43:23 +00:00
committed by Android Git Automerger
parent 22b893fde1 a48e7b5500
commit 8a3e0a5c0b
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/arrays.xml
View File

@@ -473,8 +473,6 @@
<item>@drawable/scrubber_track_qntm_alpha</item>
<item>@drawable/spinner_qntm_am_alpha</item>
<item>@drawable/switch_track_qntm_alpha</item>
<item>@drawable/tab_indicator_normal_qntm_alpha</item>
<item>@drawable/tab_indicator_selected_qntm_alpha</item>
<item>@drawable/text_cursor_qntm_alpha</item>
<item>@drawable/textfield_activated_qntm_alpha</item>
<item>@drawable/textfield_default_qntm_alpha</item>

2
graphics/java/android/graphics/drawable/Drawable.java
View File

@@ -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);
}