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

Commit bbe5fb2b authored by Gilles Debunne's avatar Gilles Debunne Committed by Android Git Automerger
Browse files

am 189de282: Merge "Fix for a Resource system bug that displayed the wrong... 

am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread

Merge commit '189de282' into gingerbread-plus-aosp

* commit '189de282':
  Fix for a Resource system bug that displayed the wrong name for missing asset.
parents 9a5c6e4f 189de282

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;

    }