Merge "Bluetooth: Check state correctly when client wants to bind" into rvc-qpr-dev

Author: TreeHugger Robot

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

@@ -1236,7 +1236,7 @@ public IBluetoothGatt getBluetoothGatt() {
     @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");
@@ -1400,7 +1400,7 @@ private boolean bindService() {
                 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");
                 }