Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b9e69a authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Fix a concurrent modification exception in Slice provider." into pi-dev

am: 350c5b3c

Change-Id: I09d3d0148b58f954cb584b5c5c63059396af8fb1
parents 1f429286 350c5b3c
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.provider.SettingsSlicesContract;
import android.support.annotation.VisibleForTesting;
import android.support.v4.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;
    }