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

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

While turning OFF do not honor ON requests. am: 090bf551 

am: 29c7056f

* commit '29c7056f':
  While turning OFF do not honor ON requests.

Change-Id: Iaa3ff49bcb42e844eb76c919a80d8b3e0017c35c
parents 3ed763f3 29c7056f

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ public final class LocalBluetoothAdapter { 
        return false;

        return false;

    }

    }





    public void setBluetoothEnabled(boolean enabled) {

    public boolean setBluetoothEnabled(boolean enabled) {

        boolean success = enabled

        boolean success = enabled

                ? mAdapter.enable()

                ? mAdapter.enable()

                : mAdapter.disable();

                : mAdapter.disable();
@@ -225,6 +225,7 @@ public final class LocalBluetoothAdapter { 




            syncBluetoothState();

            syncBluetoothState();

        }

        }

        return success;

    }

    }





    public BluetoothDevice getRemoteDevice(String address) {

    public BluetoothDevice getRemoteDevice(String address) {

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

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

                                                "Need BLUETOOTH ADMIN permission");

        if (DBG) {

        if (DBG) {

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

            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) {

        synchronized(mReceiver) {