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

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

Merge "Remove allowBlocking from BluetoothManagerService" am: 8414cfb2 am:... 

Merge "Remove allowBlocking from BluetoothManagerService" am: 8414cfb2 am: 2c8fe85d am: a728a9cf

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1970945

Change-Id: If005db529d7e7617facc581621e5b871d229e0bc
parents 2935fca0 a728a9cf

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

+1 −2
Original line number Diff line number Diff line
@@ -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