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

Commit 4e22ad35 authored by Zhihai Xu's avatar Zhihai Xu
Browse files

Settings shows it is connected to A2DP, though the device is not actually connected 

the root cause is the A2dp and Pbap service need receive STATE_TURNING_OFF intent
to shutdown cleanly. So we need send completely state transition intents
in user switch handler.

bug7403171

Change-Id: Ic92bc85c2b74ae7c95440b237ea8851771ee9f04
parent eb3aa44c

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

+31 −6
Original line number Diff line number Diff line
@@ -775,8 +775,18 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 


                        // Send BT state broadcast to update

                        // the BT icon correctly

                        if ((mState == BluetoothAdapter.STATE_TURNING_ON) ||

                            (mState == BluetoothAdapter.STATE_ON)) {

                            bluetoothStateChangeHandler(BluetoothAdapter.STATE_ON,

                                                        BluetoothAdapter.STATE_TURNING_OFF);

                            mState = BluetoothAdapter.STATE_TURNING_OFF;

                        }

                        if (mState == BluetoothAdapter.STATE_TURNING_OFF) {

                            bluetoothStateChangeHandler(BluetoothAdapter.STATE_TURNING_OFF,

                                                        BluetoothAdapter.STATE_OFF);

                        }



                        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

                        mState = BluetoothAdapter.STATE_OFF;

                    }

                    break;
@@ -820,20 +830,33 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                }

                            }

                        }

                        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);



                        if (mState == BluetoothAdapter.STATE_TURNING_OFF) {

                            // MESSAGE_USER_SWITCHED happened right after MESSAGE_ENABLE

                            bluetoothStateChangeHandler(mState, BluetoothAdapter.STATE_OFF);

                            mState = BluetoothAdapter.STATE_OFF;

                        }

                        if (mState == BluetoothAdapter.STATE_OFF) {

                            bluetoothStateChangeHandler(mState, BluetoothAdapter.STATE_TURNING_ON);

                            mState = BluetoothAdapter.STATE_TURNING_ON;

                        }



                        waitForOnOff(true, false);



                        if (mState == BluetoothAdapter.STATE_TURNING_ON) {

                            bluetoothStateChangeHandler(mState, BluetoothAdapter.STATE_ON);

                        }



                        // disable

                        handleDisable(false);

                        // Pbap service need receive STATE_TURNING_OFF intent to close

                        bluetoothStateChangeHandler(BluetoothAdapter.STATE_ON,

                                                    BluetoothAdapter.STATE_TURNING_OFF);



                        waitForOnOff(false, true);



                        bluetoothStateChangeHandler(BluetoothAdapter.STATE_ON,

                        bluetoothStateChangeHandler(BluetoothAdapter.STATE_TURNING_OFF,

                                                    BluetoothAdapter.STATE_OFF);

                        mState = BluetoothAdapter.STATE_OFF;

                        sendBluetoothServiceDownCallback();

                        synchronized (mConnection) {

                            if (mBluetooth != null) {
@@ -844,6 +867,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                        }

                        SystemClock.sleep(100);



                        mHandler.removeMessages(MESSAGE_BLUETOOTH_STATE_CHANGE);

                        mState = BluetoothAdapter.STATE_OFF;

                        // enable

                        handleEnable(false, mQuietEnable);

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