From: Fan Zhang <zhfan@google.com>
Date: Wed, 9 May 2018 23:53:43 +0000 (-0700)
Subject: Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=33b585a831ae9b43518c37952c9911ee5afa387c;p=android-x86%2Fpackages-apps-Settings.git

Merge "Fix a concurrent modification exception in Slice provider." into pi-dev am: 350c5b3c40
am: b8b9e69a94

Change-Id: I7827b526be72fb2678d7bb662e6c13f722a8aaa9
---

33b585a831ae9b43518c37952c9911ee5afa387c
diff --cc src/com/android/settings/slices/SettingsSliceProvider.java
index e6801769b4,6d6c0ecd95..71a3828e02
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@@ -28,11 -28,10 +28,10 @@@ import android.net.Uri
  import android.net.wifi.WifiManager;
  import android.os.StrictMode;
  import android.provider.Settings;
 +import androidx.annotation.VisibleForTesting;
  import android.provider.SettingsSlicesContract;
 -import android.support.annotation.VisibleForTesting;
 -import android.support.v4.graphics.drawable.IconCompat;
 +import androidx.core.graphics.drawable.IconCompat;
  import android.text.TextUtils;
- import android.util.ArrayMap;
  import android.util.Log;
  import android.util.Pair;