diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 19:19:55 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 19:20:02 -0700 |
| commit | 02857a72198613a0583cdf6863edb2df59beee04 (patch) | |
| tree | 076fcfdb52deea3aada1c0dd8b31decbd87c80b0 /core/java/android/util/ArrayMap.java | |
| parent | 10c593cf7f30ddea32889361c81ef06eabaeb6b3 (diff) | |
| parent | 7e1e76a6dc088458b159c4c89c54b78d32d7d310 (diff) | |
Merge Android Pie into master
Bug: 112104996
Change-Id: Id91836f22f2c9842975ac5b55f0f18b89db9b2f5
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; |