Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aab8a8ec authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Android (Google) Code Review
Browse files

Merge "Global settings for Bluetooth (Settings.Global.BLUETOOTH_ON) must be... 

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." into sc-v2-dev
parents 4731dd14 0cbc4474

services/core/java/com/android/server/BluetoothManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -1869,6 +1869,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    mHandler.removeMessages(MESSAGE_RESTART_BLUETOOTH_SERVICE);

                    mEnable = true;



                    if (isBle == 0) {

                        persistBluetoothSetting(BLUETOOTH_ON_BLUETOOTH);

                    }



                    // Use service interface to get the exact state

                    try {

                        mBluetoothLock.readLock().lock();
@@ -1882,7 +1886,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                    } else {

                                        Slog.w(TAG, "BT Enable in BLE_ON State, going to ON");

                                        mBluetooth.onLeServiceUp(mContext.getAttributionSource());

                                        persistBluetoothSetting(BLUETOOTH_ON_BLUETOOTH);

                                    }

                                    break;

                                case BluetoothAdapter.STATE_BLE_TURNING_ON: