commit 7989aeff661375584efac54d3d8ca3e13b5a25d7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Aug 01 01:43:25 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 01:43:25 2017 +0000
tree 24816289339f738318e975d4e3a6662b9ad6de7c
parent 42a25f5527ad1754f1fcc959467206a8c5f1c98c
parent 4630e73ec8684da8a0a09eb1e6ba313582c59fa0

Merge "Set BT to proper scan mode." into oc-mr1-dev

src/com/android/car/settings/bluetooth/BluetoothSettingsFragment.java

diff --git a/src/com/android/car/settings/bluetooth/BluetoothSettingsFragment.java b/src/com/android/car/settings/bluetooth/BluetoothSettingsFragment.java
index e35ecf8..2027b70 100644
--- a/src/com/android/car/settings/bluetooth/BluetoothSettingsFragment.java
+++ b/src/com/android/car/settings/bluetooth/BluetoothSettingsFragment.java
@@ -147,6 +147,7 @@
         mBluetoothSwitch.setChecked(mLocalAdapter.isEnabled());
         if (mLocalAdapter.isEnabled()) {
             setProgressBarVisible(true);
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
             mLocalAdapter.startScanning(true);
             if (mViewSwitcher.getCurrentView() != mSwipeRefreshLayout) {
                 mViewSwitcher.showPrevious();
@@ -168,6 +169,7 @@
         }
         getActivity().unregisterReceiver(mBroadcastReceiver);
         mDeviceAdapter.stop();
+        mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
         mLocalManager.setForegroundActivity(null);
         mLocalAdapter.stopScanning();
         mLocalManager.getEventManager().unregisterCallback(this);