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

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

Browse Source 
* commit '4b72eec34c983abb7a3afcbadd74d3bd807c4765':
  Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
This commit is contained in:
Jean-Baptiste Queru
2011-04-26 00:39:44 -07:00
committed by Android Git Automerger
parent 24a16e6c53 4b72eec34c
commit 5fcfce965f
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;