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

Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
2011-04-19 12:28:22 +02:00
parent 08d9d9a462
commit 41a5ed7cd9
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;