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

Merge "Fix Bluetooth auto turns ON in airplane mode" am: 1b9f4dbd5d am: 4b6e138c0d

Browse Source 
Change-Id: Ic88ce0c56206fdc9fb7c8ce7845e9592d02630c1
This commit is contained in:
Treehugger Robot
2020-03-30 03:39:24 +00:00
committed by Automerger Merge Worker
parent 50f5fb017a 4b6e138c0d
commit c05648cd5e
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -969,6 +969,13 @@ 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()) {
// Airplane mode is turned on while enabling BLE only mode, disable
// BLE now.
disableBleScanMode();
sendBrEdrDownCallback();
return;
}
if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) { if (isBluetoothPersistedStateOnBluetooth() || !isBleAppPresent()) {
// This triggers transition to STATE_ON // This triggers transition to STATE_ON
mBluetooth.onLeServiceUp(); mBluetooth.onLeServiceUp();