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

Commit 75399683 authored by Gilles Debunne's avatar Gilles Debunne
Browse files

Fix for a Resource system bug that displayed the wrong name for missing asset. 

I didn't reproduce the bug and cannot ensure that this will fix it. The monkey
with identical parameters stops with an ANR.

Bug http://b/issue?id=2931528

Change-Id: I45f156c6a694f2d67fe514e0f0bb367aa017f08e
parent c4554b9a

core/java/android/content/res/TypedArray.java

+1 −3
Original line number Diff line number Diff line
@@ -708,9 +708,7 @@ public class TypedArray { 
        outValue.resourceId = data[index+AssetManager.STYLE_RESOURCE_ID];

        outValue.changingConfigurations = data[index+AssetManager.STYLE_CHANGING_CONFIGURATIONS];

        outValue.density = data[index+AssetManager.STYLE_DENSITY];

        if (type == TypedValue.TYPE_STRING) {

            outValue.string = loadStringValueAt(index);

        }

        outValue.string = (type == TypedValue.TYPE_STRING) ? loadStringValueAt(index) : null;

        return true;

    }