Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev

Browse Source 
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable
This commit is contained in:
Adam Lesinski
2015-02-05 19:39:27 +00:00
committed by Android Git Automerger
parent 29039a2bdb 967439b4d1
commit abc88d0743
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/util/ArrayMap.java
View File

@@ -255,7 +255,10 @@ public final class ArrayMap<K, V> implements Map<K, V> {
}
private ArrayMap(boolean immutable) {
mHashes = EmptyArray.INT;
// If this is immutable, use the sentinal EMPTY_IMMUTABLE_INTS
// instance instead of the usual EmptyArray.INT. The reference
// is checked later to see if the array is allowed to grow.
mHashes = immutable ? EMPTY_IMMUTABLE_INTS : EmptyArray.INT;
mArray = EmptyArray.OBJECT;
mSize = 0;
}