diff options
| author | Xin Li <delphij@google.com> | 2018-08-07 16:51:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-07 16:51:24 +0000 |
| commit | e80b45506501815061b079dcb10bf87443bd385d (patch) | |
| tree | 4d74a37a2b5bab1dfa593dd0b1565cd42b720c16 /core/java/android/util/ArrayMap.java | |
| parent | 38c9e614af1f516f44f2a74fb9d0ec6963f809a8 (diff) | |
| parent | 02857a72198613a0583cdf6863edb2df59beee04 (diff) | |
Merge "Merge Android Pie into master"
Diffstat (limited to 'core/java/android/util/ArrayMap.java')
| -rw-r--r-- | core/java/android/util/ArrayMap.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java index d51a13f3d119..f1e937e83dc1 100644 --- a/core/java/android/util/ArrayMap.java +++ b/core/java/android/util/ArrayMap.java @@ -644,9 +644,11 @@ public final class ArrayMap<K, V> implements Map<K, V> { if (osize <= 1) { // Now empty. if (DEBUG) Log.d(TAG, "remove: shrink from " + mHashes.length + " to 0"); - freeArrays(mHashes, mArray, osize); + final int[] ohashes = mHashes; + final Object[] oarray = mArray; mHashes = EmptyArray.INT; mArray = EmptyArray.OBJECT; + freeArrays(ohashes, oarray, osize); nsize = 0; } else { nsize = osize - 1; |