diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-02-03 18:50:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-03 18:50:48 +0000 |
| commit | e6e57b46213aa80b75fae7774cb7008c61982df4 (patch) | |
| tree | 9cf705f1d3402000053a755e5a0943d514cbb7f8 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 2935fca0f02dd2d24b906f284dc102ed0407fb98 (diff) | |
| parent | a728a9cf696d0eacbc3bcd6d68e161ece305b0a6 (diff) | |
Merge "Remove allowBlocking from BluetoothManagerService" am: 8414cfb2b5 am: 2c8fe85dc8 am: a728a9cf69
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1970945
Change-Id: If005db529d7e7617facc581621e5b871d229e0bc
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 81a2405e7c..5e066b996a 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -2175,8 +2175,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 |