commit 7e69f41b55b35819caf16182e8c35b6d79565521
author Suprabh Shukla <suprabh@google.com> Mon May 14 16:31:21 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 14 16:31:21 2018 -0700
tree dd44fac20a15118320c536db8374524eebd1c106
parent 315211c74bcd0c68730e0b7f678d8e5215f2f919
parent 841de8fb314c4d75402909fbd3353bdf2a769c94

Merge "Mitigating cache corruption in ArrayMap" into pi-dev
am: 841de8fb31

Change-Id: Ia8e5eddc8837af23c2fdcb48b40e98f1eff3bc8b

core/java/android/util/ArrayMap.java

diff --git a/core/java/android/util/ArrayMap.java b/core/java/android/util/ArrayMap.java
index d51a13f..f1e937e 100644
--- a/core/java/android/util/ArrayMap.java
+++ b/core/java/android/util/ArrayMap.java
@@ -644,9 +644,11 @@
         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;