commit 9b6ee5d3786240010c2a648498409d4eab4b271c
author Michal Palczewski <michalp@google.com> Wed Nov 28 11:26:17 2018 -0800
committer Yuxing Yao <yaoyx@google.com> Mon Dec 10 00:58:23 2018 +0000
tree 73c043c9f64f1fca7106aa3a2c88215027d917a5
parent 24f07fcceb0ef9f8c8d026153f1cae83fb6fbf54

Use ArrayMap instead of hashmap

Bug: 120112634
Test: atest CarUxRestrictionsConfigurationTest
Change-Id: I21b540ebf946c1082872faecdffa0d25a7c8679c
(cherry picked from commit 3f200f6bd071e79b854f6b40107ef7e9c7b3b3a9)

car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java

diff --git a/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java b/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
index 659f1cd..cd7d7ab 100644
--- a/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
+++ b/car-lib/src/android/car/drivingstate/CarUxRestrictionsConfiguration.java
@@ -22,6 +22,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
+import android.util.ArrayMap;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import android.util.Log;
@@ -30,7 +31,6 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -60,7 +60,8 @@
     private final int mMaxContentDepth;
     private final int mMaxCumulativeContentItems;
     private final int mMaxStringLength;
-    private final Map<Integer, List<RestrictionsPerSpeedRange>> mUxRestrictions = new HashMap<>();
+    private final Map<Integer, List<RestrictionsPerSpeedRange>> mUxRestrictions =
+            new ArrayMap<>(DRIVING_STATES.length);
 
     private CarUxRestrictionsConfiguration(CarUxRestrictionsConfiguration.Builder builder) {
         mMaxContentDepth = builder.mMaxContentDepth;
@@ -422,7 +423,8 @@
         private int mMaxCumulativeContentItems = UX_RESTRICTIONS_UNKNOWN;
         private int mMaxStringLength = UX_RESTRICTIONS_UNKNOWN;
 
-        private Map<Integer, List<RestrictionsPerSpeedRange>> mUxRestrictions = new HashMap<>();
+        private Map<Integer, List<RestrictionsPerSpeedRange>> mUxRestrictions =
+                new ArrayMap<>(DRIVING_STATES.length);
 
         public Builder() {
             for (int drivingState : DRIVING_STATES) {