diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-25 13:33:37 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-04-25 13:33:37 -0700 |
| commit | 4b72eec34c983abb7a3afcbadd74d3bd807c4765 (patch) | |
| tree | 54477ec37405a2bd46146166edad27f485f817a1 /core/java/android | |
| parent | ec1a8f7aa7e71e292ef813b1e886a9e26e3635af (diff) | |
| parent | 41a5ed7cd9f56d955a797a485c11ae5e7ccfb094 (diff) | |
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 1 |
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 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; |