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

Commit fdb22c18 authored by Sanket Agarwal's avatar Sanket Agarwal Committed by android-build-merger
Browse files

While turning OFF do not honor ON requests. am: 292415fd 

am: 9d2441369b

* commit '9d2441369bdc89739274716a2118c3710daaa51f':
  While turning OFF do not honor ON requests.

Change-Id: Ic1cfba41175acaeed32f97873a3d85ee0d98c8ac
parents d4d1e9b8 292415fd

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+14 −1
Original line number Diff line number Diff line
@@ -613,7 +613,20 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                                                "Need BLUETOOTH ADMIN permission");

        if (DBG) {

            Slog.d(TAG,"enable():  mBluetooth =" + mBluetooth +

                    " mBinding = " + mBinding);

                    " mBinding = " + mBinding + " mState = " + mState);

        }

        // We do not honor ON requests when the adapter is already turned ON or in the process of

        // turning ON.

        // As a protective mechanism to make sure that the native stack gets cleaned up properly

        // before turning it back ON we ignore requests while the bluetooth is turning OFF.

        // Bug: b/28318203

        if (mState == BluetoothAdapter.STATE_BLE_TURNING_OFF ||

            mState == BluetoothAdapter.STATE_TURNING_OFF ||

            mState == BluetoothAdapter.STATE_ON ||

            mState == BluetoothAdapter.STATE_BLE_ON ||

            mState == BluetoothAdapter.STATE_TURNING_ON ||

            mState == BluetoothAdapter.STATE_BLE_TURNING_ON) {

            return false;

        }



        synchronized(mReceiver) {