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

Commit 350c5b3c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 1dbe185d a55993c1

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ import android.provider.SettingsSlicesContract; 
import android.support.annotation.VisibleForTesting;

import android.support.annotation.VisibleForTesting;

import android.support.v4.graphics.drawable.IconCompat;

import android.support.v4.graphics.drawable.IconCompat;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Log;

import android.util.Pair;

import android.util.Pair;
@@ -45,6 +44,7 @@ import java.util.Collection; 
import java.util.List;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.WeakHashMap;

import java.util.WeakHashMap;

import java.util.concurrent.ConcurrentHashMap;





import androidx.slice.Slice;

import androidx.slice.Slice;

import androidx.slice.SliceProvider;

import androidx.slice.SliceProvider;
@@ -116,6 +116,7 @@ public class SettingsSliceProvider extends SliceProvider { 




    @VisibleForTesting

    @VisibleForTesting

    Map<Uri, SliceData> mSliceWeakDataCache;

    Map<Uri, SliceData> mSliceWeakDataCache;

    @VisibleForTesting

    Map<Uri, SliceData> mSliceDataCache;

    Map<Uri, SliceData> mSliceDataCache;





    public SettingsSliceProvider() {

    public SettingsSliceProvider() {
@@ -125,7 +126,7 @@ public class SettingsSliceProvider extends SliceProvider { 
    @Override

    @Override

    public boolean onCreateSliceProvider() {

    public boolean onCreateSliceProvider() {

        mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());

        mSlicesDatabaseAccessor = new SlicesDatabaseAccessor(getContext());

        mSliceDataCache = new ArrayMap<>();

        mSliceDataCache = new ConcurrentHashMap<>();

        mSliceWeakDataCache = new WeakHashMap<>();

        mSliceWeakDataCache = new WeakHashMap<>();

        return true;

        return true;

    }

    }