diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-07-18 23:53:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-18 23:53:33 +0000 |
| commit | 059bf080fb29abc7b3fe3e848e68cd105c4f7528 (patch) | |
| tree | a2c44281b07cc94388d946c609344399963a07a9 /core/java | |
| parent | be94819065f241208913c6a9d66e09c579febac6 (diff) | |
| parent | 127c5ef5d7bf2dc44fc53deeda9058a17e27addb (diff) | |
| download | frameworks_base-059bf080fb29abc7b3fe3e848e68cd105c4f7528.zip frameworks_base-059bf080fb29abc7b3fe3e848e68cd105c4f7528.tar.gz frameworks_base-059bf080fb29abc7b3fe3e848e68cd105c4f7528.tar.bz2 | |
Merge "Fix crash."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Bundle.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index 2b0ae3a..48eb8cc 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -216,6 +216,8 @@ public final class Bundle implements Parcelable, Cloneable { } if (mMap == null) { mMap = new ArrayMap<String, Object>(N); + } else { + mMap.ensureCapacity(N); } mParcelledData.readArrayMapInternal(mMap, N, mClassLoader); mParcelledData.recycle(); |