From: Jason Monk <jmonk@google.com>
Date: Thu, 26 Apr 2018 21:26:38 +0000 (-0700)
Subject: Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0d3322a57b21610a3feb1b6c9340ff61de557017;p=android-x86%2Fpackages-apps-Settings.git

Merge "Push full slice index to device index" into pi-dev am: 3d29ca2893
am: 2332aad2a6

Change-Id: I3563eb7ed2ab93b35b1a950d89ca2466abaa59e3
---

0d3322a57b21610a3feb1b6c9340ff61de557017
diff --cc src/com/android/settings/slices/SettingsSliceProvider.java
index 8aac2e3e48,b33308c06e..340a996171
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@@ -24,10 -24,11 +24,11 @@@ import android.content.Intent
  import android.graphics.drawable.Icon;
  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;