diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-07-11 20:41:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-11 20:41:31 +0000 |
| commit | f0d921c41ac5f16b45fd24b7c2b089e3e01952f0 (patch) | |
| tree | b28b2bf97bb7e257445e48a23408bfe1e49473e6 | |
| parent | 5578077ad368279e8d13a2a87ccab5fc7bd8992a (diff) | |
| parent | 360b2c4434c0bbbb2a56366ae0ac754256bc5407 (diff) | |
| download | base-android-o-mr1-iot-release-1.0.14.tar.gz | |
Merge "Replace HashMap with ArrayMap for services"android-o-mr1-iot-release-1.0.14
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 11 | ||||
| -rw-r--r-- | core/java/android/os/ServiceManager.java | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index f6b7eefc7864..b19cd1c1ffb3 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -150,6 +150,7 @@ import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccCardManager; import android.telephony.euicc.EuiccManager; import android.telephony.ims.RcsManager; +import android.util.ArrayMap; import android.util.Log; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; @@ -171,7 +172,7 @@ import com.android.internal.net.INetworkWatchlistManager; import com.android.internal.os.IDropBoxManagerService; import com.android.internal.policy.PhoneLayoutInflater; -import java.util.HashMap; +import java.util.Map; /** * Manages all of the system services that can be returned by {@link Context#getSystemService}. @@ -182,10 +183,10 @@ final class SystemServiceRegistry { // Service registry information. // This information is never changed once static initialization has completed. - private static final HashMap<Class<?>, String> SYSTEM_SERVICE_NAMES = - new HashMap<Class<?>, String>(); - private static final HashMap<String, ServiceFetcher<?>> SYSTEM_SERVICE_FETCHERS = - new HashMap<String, ServiceFetcher<?>>(); + private static final Map<Class<?>, String> SYSTEM_SERVICE_NAMES = + new ArrayMap<Class<?>, String>(); + private static final Map<String, ServiceFetcher<?>> SYSTEM_SERVICE_FETCHERS = + new ArrayMap<String, ServiceFetcher<?>>(); private static int sServiceCacheSize; // Not instantiable. diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java index b2ba92849133..9a9b0306063b 100644 --- a/core/java/android/os/ServiceManager.java +++ b/core/java/android/os/ServiceManager.java @@ -17,13 +17,13 @@ package android.os; import android.annotation.UnsupportedAppUsage; +import android.util.ArrayMap; import android.util.Log; import com.android.internal.annotations.GuardedBy; import com.android.internal.os.BinderInternal; import com.android.internal.util.StatLogger; -import java.util.HashMap; import java.util.Map; /** @hide */ @@ -38,7 +38,7 @@ public final class ServiceManager { * Cache for the "well known" services, such as WM and AM. */ @UnsupportedAppUsage - private static HashMap<String, IBinder> sCache = new HashMap<String, IBinder>(); + private static Map<String, IBinder> sCache = new ArrayMap<String, IBinder>(); /** * We do the "slow log" at most once every this interval. |