Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am: 350c5b3c40 (33b585a8) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/slices/SettingsSliceProvider.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -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<Uri, SliceData> mSliceWeakDataCache;
		@VisibleForTesting
		Map<Uri, SliceData> 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;
		}