From: tim peng <timhypeng@google.com>
Date: Tue, 22 May 2018 04:44:15 +0000 (+0000)
Subject: Merge changes I6d4f8ec3,Id4c1e86c into pi-dev
X-Git-Tag: android-x86-9.0-r1~31^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e3a87548e5bc488a76f0d197f059fe1edb8bbb57;p=android-x86%2Fpackages-apps-Settings.git

Merge changes I6d4f8ec3,Id4c1e86c into pi-dev

* changes:
  Make device discoverable in Connected Devices settings page
  Add bluetooth discoverable footer preference in connected devices page
---

e3a87548e5bc488a76f0d197f059fe1edb8bbb57
diff --cc tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index cea258d67c,fd1ec157b6..eecbca5afe
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@@ -30,7 -30,9 +30,8 @@@ import android.content.pm.PackageManage
  import android.provider.SearchIndexableResource;
  
  import com.android.settings.R;
 -import com.android.settings.nfc.NfcPreferenceController;
  import com.android.settings.testutils.SettingsRobolectricTestRunner;
+ import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
  import com.android.settings.testutils.shadow.ShadowBluetoothPan;
  import com.android.settings.testutils.shadow.ShadowConnectivityManager;
  import com.android.settings.testutils.shadow.ShadowUserManager;