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

am: 4467c845c0 Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
2016-06-09 21:16:32 +00:00
parent ae7641a894 4467c845c0
commit 2df165b8db
1 changed files with 1 additions and 1 deletions
--- 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