diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 042af41693030..1de26c72621bd 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -473,8 +473,6 @@
- @drawable/scrubber_track_qntm_alpha
- @drawable/spinner_qntm_am_alpha
- @drawable/switch_track_qntm_alpha
- - @drawable/tab_indicator_normal_qntm_alpha
- - @drawable/tab_indicator_selected_qntm_alpha
- @drawable/text_cursor_qntm_alpha
- @drawable/textfield_activated_qntm_alpha
- @drawable/textfield_default_qntm_alpha
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index f29b9f06bec57..76dd1c896bcdc 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);
}