Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-04-25 13:33:37 -07:00
committed by Android Code Review
parent ec1a8f7aa7 41a5ed7cd9
commit 4b72eec34c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/content/res/AssetManager.java
View File

@@ -234,6 +234,7 @@ public final class AssetManager {
StringBlock[] blocks = mStringBlocks; StringBlock[] blocks = mStringBlocks;
if (blocks == null) { if (blocks == null) {
ensureStringBlocks(); ensureStringBlocks();
blocks = mStringBlocks;
} }
outValue.string = blocks[block].get(outValue.data); outValue.string = blocks[block].get(outValue.data);
return true; return true;