From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Wed, 23 May 2018 20:41:22 +0000 (+0000)
Subject: Merge "Hook up blocked keys" into pi-dev
X-Git-Tag: android-x86-9.0-r1~29^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a60ea38f67;p=android-x86%2Fpackages-apps-Settings.git

Merge "Hook up blocked keys" into pi-dev
---

a60ea38f676d8575bb5174dd953093695360aeca
diff --cc tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index bb064d1f91,c1d87ed50e..df960d8a91
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@@ -35,8 -36,8 +36,9 @@@ import android.database.sqlite.SQLiteDa
  import android.net.Uri;
  import android.os.StrictMode;
  import android.provider.SettingsSlicesContract;
+ import android.util.ArraySet;
  
 +import com.android.settings.location.LocationSliceBuilder;
  import com.android.settings.wifi.WifiSliceBuilder;
  import com.android.settings.bluetooth.BluetoothSliceBuilder;
  import com.android.settings.notification.ZenModeSliceBuilder;