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

Commit 2df165b8 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov Committed by android-build-merger
Browse files

Merge \"Unlock mBluetoothLock.readLock() instead of double-locking it\" 

am: 4467c845

Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
parents ae7641a8 4467c845

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
                            } catch(RemoteException e) {

                                Log.e(TAG,"Unable to call onBrEdrDown", e);

                            } finally {

                                mBluetoothLock.readLock().lock();

                                mBluetoothLock.readLock().unlock();

                            }

                        } else if (st == BluetoothAdapter.STATE_ON){

                            // disable without persisting the setting