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

am: 4467c845c0

Change-Id: I4f5a7486c2f946c9f1d646278b6cdf5a26fc49c4
This commit is contained in:
Pavlin Radoslavov
2016-06-09 21:16:32 +00:00
committed by android-build-merger

View File

@@ -225,7 +225,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
} catch(RemoteException e) { } catch(RemoteException e) {
Log.e(TAG,"Unable to call onBrEdrDown", e); Log.e(TAG,"Unable to call onBrEdrDown", e);
} finally { } finally {
mBluetoothLock.readLock().lock(); mBluetoothLock.readLock().unlock();
} }
} else if (st == BluetoothAdapter.STATE_ON){ } else if (st == BluetoothAdapter.STATE_ON){
// disable without persisting the setting // disable without persisting the setting