summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-07-18 16:51:04 -0700
committerDianne Hackborn <hackbod@google.com>2013-07-18 16:51:04 -0700
commit127c5ef5d7bf2dc44fc53deeda9058a17e27addb (patch)
treec7f88a1e2a6557e70caca88c1e908982d55db51c /core/java
parent152b69ada49f08c422c30002f1b179d6bf1353f3 (diff)
downloadframeworks_base-127c5ef5d7bf2dc44fc53deeda9058a17e27addb.zip
frameworks_base-127c5ef5d7bf2dc44fc53deeda9058a17e27addb.tar.gz
frameworks_base-127c5ef5d7bf2dc44fc53deeda9058a17e27addb.tar.bz2
Fix crash.
Change-Id: I0b5d846d5a9e6b1c7c3756b653833c263634270b
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/Bundle.java2
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();