diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-26 10:24:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-26 10:24:27 -0700 |
| commit | 31418a1e9b905593587d8bf7a4705429db549d97 (patch) | |
| tree | ed35cb760198fa1e358b377a358e17b02d4eb50c /core/java | |
| parent | 4e1027e45dbe292b1bdcbd3500b20f00618303f4 (diff) | |
| parent | 45e13ec1c5cd765162b7450b1c3a4632e8979894 (diff) | |
| download | frameworks_base-31418a1e9b905593587d8bf7a4705429db549d97.zip frameworks_base-31418a1e9b905593587d8bf7a4705429db549d97.tar.gz frameworks_base-31418a1e9b905593587d8bf7a4705429db549d97.tar.bz2 | |
am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '45e13ec1c5cd765162b7450b1c3a4632e8979894':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index e279f64..fc6761d 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -235,6 +235,7 @@ public final class AssetManager { StringBlock[] blocks = mStringBlocks; if (blocks == null) { ensureStringBlocks(); + blocks = mStringBlocks; } outValue.string = blocks[block].get(outValue.data); return true; |