PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BLuetooth Discoverable timer not correctly cleared"

Browse Source
This commit is contained in:
Zhihai Xu
2013-12-19 21:49:50 +00:00
committed by Android (Google) Code Review
parent 3f538cc3f8 54313d7d66
commit 23d886f698
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
View File

@@ -143,7 +143,10 @@ final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClick
if (timeout > 0) { if (timeout > 0) {
BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp); BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
} else {
BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
} }
} else { } else {
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE); mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext); BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);