diff options
| author | Gilles Debunne <debunne@google.com> | 2010-08-19 15:27:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-19 15:27:12 -0700 |
| commit | 189de2820932fd5dc98b9639fdc420a57cfa2316 (patch) | |
| tree | 59a40088e2e3ff91df4ea38ac07149fd5080138f | |
| parent | 18ef37258d897928c68b89535a93b99d8a817d3c (diff) | |
| parent | 75399683a418fff55539e6028341caa2e7572362 (diff) | |
| download | frameworks_base-189de2820932fd5dc98b9639fdc420a57cfa2316.zip frameworks_base-189de2820932fd5dc98b9639fdc420a57cfa2316.tar.gz frameworks_base-189de2820932fd5dc98b9639fdc420a57cfa2316.tar.bz2 | |
Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread
| -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; } |