From 0a3169bc6652f8cfb0b57ec9d6ac7491b5126bf8 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Mon, 12 Jun 2017 11:59:47 -0700 Subject: [PATCH] 1. Replace use of java.util.HashMap with android.util.ArrayMap in ShortcutCache class 2. Get rid of unused constants from ShortcutCache class 3. Make instance variables final Bug: 62466540 Change-Id: I465da77aa1521790c8359d0f9987d3fc1286b44b --- .../android/launcher3/shortcuts/ShortcutCache.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/com/android/launcher3/shortcuts/ShortcutCache.java b/src/com/android/launcher3/shortcuts/ShortcutCache.java index d4db96d313..5742d1de3f 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutCache.java +++ b/src/com/android/launcher3/shortcuts/ShortcutCache.java @@ -19,9 +19,8 @@ package com.android.launcher3.shortcuts; import android.annotation.TargetApi; import android.os.Build; import android.os.UserHandle; +import android.util.ArrayMap; import android.util.LruCache; - -import java.util.HashMap; import java.util.List; /** @@ -31,18 +30,15 @@ import java.util.List; */ @TargetApi(Build.VERSION_CODES.N) public class ShortcutCache { - private static final String TAG = "ShortcutCache"; - private static final boolean LOGD = false; - private static final int CACHE_SIZE = 30; // Max number shortcuts we cache. - private LruCache mCachedShortcuts; + private final LruCache mCachedShortcuts; // We always keep pinned shortcuts in the cache. - private HashMap mPinnedShortcuts; + private final ArrayMap mPinnedShortcuts; public ShortcutCache() { mCachedShortcuts = new LruCache<>(CACHE_SIZE); - mPinnedShortcuts = new HashMap<>(); + mPinnedShortcuts = new ArrayMap<>(); } /**