From 41a5ed7cd9f56d955a797a485c11ae5e7ccfb094 Mon Sep 17 00:00:00 2001
From: Jozef BABJAK <jozef.babjak@gmail.com>
Date: Tue, 19 Apr 2011 12:28:22 +0200
Subject: [PATCH] Re-assingning local variable if mStringBlocks was initialized
 here. NPE is thrown otherwise.

Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
---
 core/java/android/content/res/AssetManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index 73d9458fbec3..4702327e71a9 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;
-- 
2.11.0