Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c5abb3 authored by Adam Lesinski's avatar Adam Lesinski Committed by android-build-merger
Browse files

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

automerge: abc88d07

* commit 'abc88d07':
  Make ArrayMap.EMPTY immutable
parents 4fdac613 abc88d07

core/java/android/util/ArrayMap.java

+4 −1
Original line number Diff line number Diff line
@@ -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;

    }