commit 7fbbbd5ea15aaed1419a4362fc819fb57529cfb9
author Pavlin Radoslavov <pavlin@google.com> Thu Jun 09 20:13:44 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 09 20:13:44 2016 +0000
tree 3ec98c4374b544c7975459bb1a6a3f0815df0057
parent c28647084eb38c8171e6c64b7726ac38dd464e8e
parent 7ee53be300573c9bdc71607d32d4a642e4ad3dc8

Unlock mBluetoothLock.readLock() instead of double-locking it
am: 7ee53be300

Change-Id: I521890b2554b47f278f1e3d169b3a3cde825240f

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

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index d58f864..71964d1 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -222,7 +222,7 @@
                             } catch (RemoteException e) {
                                 Slog.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