diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-06-09 21:10:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-09 21:10:29 +0000 |
| commit | 4467c845c09ebab4e1e503709fca8ccb55e35007 (patch) | |
| tree | 1c41222e0b0a5df425f8e3ea81f77b15b613d5cd | |
| parent | 98cf9d1a606e17b5eeedad5fff9bb5935ebb370b (diff) | |
| parent | b9154bc988281b8f01313b7248a2586d06b73e33 (diff) | |
| download | base-4467c845c09ebab4e1e503709fca8ccb55e35007.tar.gz | |
Merge "Unlock mBluetoothLock.readLock() instead of double-locking it"android-n-preview-4
| -rw-r--r-- | services/core/java/com/android/server/BluetoothManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 83486d60792b..5da353fae23e 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -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 |