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.
2011-04-26 01:20:37 -07:00
parent 78d4e71dec 5fcfce965f
commit 45e13ec1c5
1 changed files with 1 additions and 0 deletions
--- 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;