diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index e6801769b4b..71a3828e02e 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -32,7 +32,6 @@ import androidx.annotation.VisibleForTesting; import android.provider.SettingsSlicesContract; import androidx.core.graphics.drawable.IconCompat; import android.text.TextUtils; -import android.util.ArrayMap; import android.util.Log; import android.util.Pair; @@ -45,6 +44,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.WeakHashMap; +import java.util.concurrent.ConcurrentHashMap; import androidx.slice.Slice; import androidx.slice.SliceProvider; @@ -116,6 +116,7 @@ public class SettingsSliceProvider extends SliceProvider { @VisibleForTesting Map mSliceWeakDataCache; + @VisibleForTesting Map mSliceDataCache; public SettingsSliceProvider() { @@ -125,7 +126,7 @@ public class SettingsSliceProvider extends SliceProvider { @Override public boolean onCreateSliceProvider() { mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext()); - mSliceDataCache = new ArrayMap<>(); + mSliceDataCache = new ConcurrentHashMap<>(); mSliceWeakDataCache = new WeakHashMap<>(); return true; }