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

Commit a7e988d3 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
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 am: aab8a8ec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16439731

Change-Id: I8c3b403052114de3d85911b360bb46d7bf9f8ac5
parents 769b424d aab8a8ec

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

+4 −1
Original line number Diff line number Diff line
@@ -1850,6 +1850,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();
@@ -1863,7 +1867,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: