Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp

* commit '189de2820932fd5dc98b9639fdc420a57cfa2316':
  Fix for a Resource system bug that displayed the wrong name for missing asset.
This commit is contained in:
Gilles Debunne
2010-08-19 15:29:24 -07:00
committed by Android Git Automerger
parent 9a5c6e4f56 189de28209
commit bbe5fb2b73
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/res/TypedArray.java
View File

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