Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a48e7b55 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix build, fix Drawable loop" into lmp-preview-dev

parents 55a54e17 910a0b4d

core/res/res/values/arrays.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

graphics/java/android/graphics/drawable/Drawable.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }