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

Commit 196b72aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix for Bluetooth not restarting on User Switch"

parents 85faffa7 7d1203a2

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

+3 −1
Original line number Diff line number Diff line
@@ -1699,7 +1699,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                    mHandler.removeMessages(MESSAGE_USER_SWITCHED);



                    /* disable and enable BT when detect a user switch */

                    if (mEnable && mBluetooth != null) {

                    if (mBluetooth != null && isEnabled()) {

                        try {

                            mBluetoothLock.readLock().lock();

                            if (mBluetooth != null) {
@@ -1768,6 +1768,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                        mState = BluetoothAdapter.STATE_OFF;

                        // enable

                        addActiveLog(REASON_USER_SWITCH, true);

                        // mEnable flag could have been reset on disableBLE. Reenable it.

                        mEnable = true;

                        handleEnable(mQuietEnable);

                    } else if (mBinding || mBluetooth != null) {

                        Message userMsg = mHandler.obtainMessage(MESSAGE_USER_SWITCHED);