diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-19 15:29:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-19 15:29:24 -0700 |
| commit | bbe5fb2b73172a6b42b3406354a3556bd53916e1 (patch) | |
| tree | d642233d6b52303c64038964a052f54896c63ad6 /core/java/android/content/res | |
| parent | 9a5c6e4f56e574e7591d8d3af1c2b64053df407f (diff) | |
| parent | 189de2820932fd5dc98b9639fdc420a57cfa2316 (diff) | |
| download | frameworks_base-bbe5fb2b73172a6b42b3406354a3556bd53916e1.zip frameworks_base-bbe5fb2b73172a6b42b3406354a3556bd53916e1.tar.gz frameworks_base-bbe5fb2b73172a6b42b3406354a3556bd53916e1.tar.bz2 | |
am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
Merge commit '189de2820932fd5dc98b9639fdc420a57cfa2316' into gingerbread-plus-aosp
* commit '189de2820932fd5dc98b9639fdc420a57cfa2316':
Fix for a Resource system bug that displayed the wrong name for missing asset.
Diffstat (limited to 'core/java/android/content/res')
| -rw-r--r-- | core/java/android/content/res/TypedArray.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index b0c149d..37fdeb6 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -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; } |