diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-26 12:45:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-26 12:45:52 -0700 |
| commit | b7642cbae40aa6b1c54e5b39ed046f7f52e327d9 (patch) | |
| tree | 51bd4711d27c207b1c1f290dfa1e750f2766ff2f /core/java | |
| parent | 86c5a9995f130c069eded44c155b232a47fd2341 (diff) | |
| parent | 31418a1e9b905593587d8bf7a4705429db549d97 (diff) | |
| download | frameworks_base-b7642cbae40aa6b1c54e5b39ed046f7f52e327d9.zip frameworks_base-b7642cbae40aa6b1c54e5b39ed046f7f52e327d9.tar.gz frameworks_base-b7642cbae40aa6b1c54e5b39ed046f7f52e327d9.tar.bz2 | |
am 31418a1e: am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
* commit '31418a1e9b905593587d8bf7a4705429db549d97':
Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.
Diffstat (limited to 'core/java')
| -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 c8c5733..be67e96 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; |