Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."

2011-04-25 13:33:37 -07:00
parent ec1a8f7aa7 41a5ed7cd9
commit 4b72eec34c
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;