diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-03 19:04:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-03 19:04:18 +0000 |
| commit | 4292ed1878a0b4e4fc3518522ddc1a834f38cc64 (patch) | |
| tree | dbcc89e0f6ab0d3902c1c69b28cbf535f726cf0e /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | c7b93a8dc8177fd49635978de9e55ca5514fffe0 (diff) | |
| parent | e6e57b46213aa80b75fae7774cb7008c61982df4 (diff) | |
Merge "Remove allowBlocking from BluetoothManagerService" am: 8414cfb2b5 am: 2c8fe85dc8 am: a728a9cf69 am: e6e57b4621
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1970945
Change-Id: I2c77c9f217e322860885d82b09d740ea7e48bdf3
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index a60241306d..a4d31e2b3f 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -2182,8 +2182,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { try { mBluetoothLock.writeLock().lock(); if (msg.arg1 == SERVICE_IBLUETOOTHGATT) { - mBluetoothGatt = - IBluetoothGatt.Stub.asInterface(Binder.allowBlocking(service)); + mBluetoothGatt = IBluetoothGatt.Stub.asInterface(service); continueFromBleOnState(); break; } // else must be SERVICE_IBLUETOOTH |