diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-11 20:09:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-11 20:09:08 +0000 |
| commit | c8f2295f679c1d4ec1d9b69951c31d8e8e18c724 (patch) | |
| tree | 949f1036b00d7cc654b0ccd14c64878843952cc7 | |
| parent | c568376083a4ab1d7e3277df404fbcd32134fd30 (diff) | |
| parent | 4e1fe29cf0b459d180969f834241e1700c37b210 (diff) | |
Merge "Bluetooth: Check state correctly when client wants to bind" am: d77aaf6a6e am: 4e1fe29cf0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d0e3a6b8d539e3b26981f3b4080f37ed20a34d9
| -rw-r--r-- | services/core/java/com/android/server/BluetoothManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 0b8b3526400a..aab05532e2b7 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -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"); } |