Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable Bluetooth if BLE was disabled while enabling" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-03 01:27:01 +00:00
committed by Android (Google) Code Review
parent a3aac62786 f7065dc952
commit 6e97539ea4
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -954,7 +954,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} }
/** /**
* Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on. * Call IBluetooth.onLeServiceUp() to continue if Bluetooth should be on,
* call IBluetooth.onBrEdrDown() to disable if Bluetooth should be off.
*/ */
private void continueFromBleOnState() { private void continueFromBleOnState() {
if (DBG) { if (DBG) {
@@ -966,11 +967,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
Slog.e(TAG, "onBluetoothServiceUp: mBluetooth is null!"); Slog.e(TAG, "onBluetoothServiceUp: mBluetooth is null!");
return; return;
} }
if (!mEnableExternal && !isBleAppPresent() && isAirplaneModeOn()) { if (!mEnableExternal && !isBleAppPresent()) {
// Airplane mode is turned on while enabling BLE only mode, disable Slog.i(TAG, "Bluetooth was disabled while enabling BLE, disable BLE now");
// BLE now. mEnable = false;
disableBleScanMode(); mBluetooth.onBrEdrDown();
sendBrEdrDownCallback();
return; return;
} }
if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) { if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) {