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

Commit 1e9e26b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Check state correctly when client wants to bind" am: 8871c2b3 am: 87c60019 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d0e3a6b8d539e3b26981f3b4080f37ed20a34d9
parents 2debb7cd 87c60019

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

+2 −2
Original line number Diff line number Diff line
@@ -1265,7 +1265,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
    @Override

    public boolean bindBluetoothProfileService(int bluetoothProfile,

            IBluetoothProfileServiceConnection proxy) {

        if (!mEnable) {

        if (mState != BluetoothAdapter.STATE_ON) {

            if (DBG) {

                Slog.d(TAG, "Trying to bind to profile: " + bluetoothProfile

                        + ", while Bluetooth was disabled");
@@ -1431,7 +1431,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                mBluetoothLock.readLock().unlock();

            }



            if (!mEnable || state != BluetoothAdapter.STATE_ON) {

            if (state != BluetoothAdapter.STATE_ON) {

                if (DBG) {

                    Slog.d(TAG, "Unable to bindService while Bluetooth is disabled");

                }