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

Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be set to BLUETOOTH_ON_BLUETOOTH whenever non-BLE MESSAGE_ENABLE is handled irrespective of the state." am: 28c8ad15b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1919033

Change-Id: I911506f3f9ec5344f7a28ffe5cfa46327e988ba6
This commit is contained in:
Treehugger Robot
2021-12-24 06:30:47 +00:00
committed by Automerger Merge Worker
parent 2f095ae40b 28c8ad15b6
commit 19703c51c1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1850,6 +1850,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mHandler.removeMessages(MESSAGE_RESTART_BLUETOOTH_SERVICE); mHandler.removeMessages(MESSAGE_RESTART_BLUETOOTH_SERVICE);
mEnable = true; mEnable = true;
if (isBle == 0) {
persistBluetoothSetting(BLUETOOTH_ON_BLUETOOTH);
}
// Use service interface to get the exact state // Use service interface to get the exact state
try { try {
mBluetoothLock.readLock().lock(); mBluetoothLock.readLock().lock();
@@ -1863,7 +1867,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} else { } else {
Slog.w(TAG, "BT Enable in BLE_ON State, going to ON"); Slog.w(TAG, "BT Enable in BLE_ON State, going to ON");
mBluetooth.onLeServiceUp(mContext.getAttributionSource()); mBluetooth.onLeServiceUp(mContext.getAttributionSource());
persistBluetoothSetting(BLUETOOTH_ON_BLUETOOTH);
} }
break; break;
case BluetoothAdapter.STATE_BLE_TURNING_ON: case BluetoothAdapter.STATE_BLE_TURNING_ON: