diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-26 01:20:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-26 01:20:37 -0700 |
| commit | 45e13ec1c5cd765162b7450b1c3a4632e8979894 (patch) | |
| tree | 9a1ebc0fbb58731456ccc6ed259f4cdc582f429a | |
| parent | 78d4e71dec9e8c60e24656fd0feeafbbf0ac78e9 (diff) | |
| parent | 5fcfce965f1380ee7e151c1df75b247dd42b349e (diff) | |
| download | frameworks_base-45e13ec1c5cd765162b7450b1c3a4632e8979894.zip frameworks_base-45e13ec1c5cd765162b7450b1c3a4632e8979894.tar.gz frameworks_base-45e13ec1c5cd765162b7450b1c3a4632e8979894.tar.bz2 | |
am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '5fcfce965f1380ee7e151c1df75b247dd42b349e':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
| -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 73d9458..4702327 100644 --- a/core/java/android/content/res/AssetManager.java +++ b/core/java/android/content/res/AssetManager.java @@ -234,6 +234,7 @@ public final class AssetManager { StringBlock[] blocks = mStringBlocks; if (blocks == null) { ensureStringBlocks(); + blocks = mStringBlocks; } outValue.string = blocks[block].get(outValue.data); return true; |