From 910a0b4d02d0be3e164a32825785fa3d02fe55a2 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Tue, 3 Jun 2014 15:48:30 -0700
Subject: [PATCH] Fix build, fix Drawable loop

Change-Id: I524b7f40c700ebe601fdbe80644a46e90ab2bba0
---
 core/res/res/values/arrays.xml                        | 2 --
 graphics/java/android/graphics/drawable/Drawable.java | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

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