summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozef BABJAK <jozef.babjak@gmail.com>2011-04-19 12:28:22 +0200
committerJozef BABJAK <jozef.babjak@gmail.com>2011-04-19 12:28:22 +0200
commit41a5ed7cd9f56d955a797a485c11ae5e7ccfb094 (patch)
treee1fddfcc94af45914d7880ce307cbbec9d920cea
parent08d9d9a46250c4fad66e9b637e8898a3524c4286 (diff)
downloadframeworks_base-41a5ed7cd9f56d955a797a485c11ae5e7ccfb094.zip
frameworks_base-41a5ed7cd9f56d955a797a485c11ae5e7ccfb094.tar.gz
frameworks_base-41a5ed7cd9f56d955a797a485c11ae5e7ccfb094.tar.bz2
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Change-Id: Ic8648aa5ae6a61348803171243c1c217feb058ec
-rw-r--r--core/java/android/content/res/AssetManager.java1
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;