diff options
| author | Roman Birg <roman@cyngn.com> | 2015-05-14 17:29:59 -0700 |
|---|---|---|
| committer | André Rivotti Casimiro <acasimiro@cyngn.com> | 2016-03-21 16:51:55 +0000 |
| commit | f5dea70443a1c0643be50cf8058ddbfff477712f (patch) | |
| tree | 42b056c682be11c441389602dd74bc1479ffb826 /src | |
| parent | 5ec1a5fa5beb30ff22e48b25ffc96364829ddb78 (diff) | |
| download | packages_apps_Settings-f5dea70443a1c0643be50cf8058ddbfff477712f.zip packages_apps_Settings-f5dea70443a1c0643be50cf8058ddbfff477712f.tar.gz packages_apps_Settings-f5dea70443a1c0643be50cf8058ddbfff477712f.tar.bz2 | |
Settings: fix BT switch enabling discoverable mode
Signed-off-by: Roman Birg <roman@cyngn.com>
Conflicts:
src/com/android/settings/bluetooth/BluetoothEnabler.java
Bug: CYNGNOS-2271
Change-Id: I6b2dff88fb858d34a1b534705b2c67f5ab4c2d29
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothEnabler.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothSettings.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java index 7d6bebe..b6399b0 100644 --- a/src/com/android/settings/bluetooth/BluetoothEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java @@ -137,7 +137,6 @@ public final class BluetoothEnabler extends GenericSwitchToggle { setChecked(true); setEnabled(true); updateSearchIndex(true); - mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE); break; case BluetoothAdapter.STATE_TURNING_OFF: setEnabled(false); diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index d08cb34..0f0952e 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -227,6 +227,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem if (mBluetoothEnabler != null) { mBluetoothEnabler.resume(getActivity()); } + if (mLocalAdapter != null) { + // enable page and inquiry scan + mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE); + } super.onResume(); mInitiateDiscoverable = true; |