Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix deadlock in LocalBluetoothManager

Browse Source 
Following deadlock exist in previous code:
1. Main thread
Device.refresh()->Device.dispatchCallback()->Lock callback->(handle
callback in systemui)->DeviceManager.getDevicesCopy()-> try lock
deviceManager
2. Bg thread
DeviceManager.onUuidChange()->Lock
deviceManager->Device.refresh()->Device.dispatchCallback()-> try lock
callback

This CL remove sychnorized method in DeviceManager to unblock this
deadlock. Since UuidChange can only happen in bg thread, we don't need
this extra lock in DeviceManager.

Fixes: 112483982
Test: Manual
Change-Id: I1a8bb130cfff40358783f5f5da7e50e5f0a42e20
This commit is contained in:
jackqdyulei
2019-02-13 13:17:38 -08:00
parent 989bb3714f
commit 77535ce22a
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
View File

@@ -420,14 +420,20 @@ public class BluetoothEventManager {
private class ClassChangedHandler implements Handler {
public void onReceive(Context context, Intent intent,
BluetoothDevice device) {
mDeviceManager.onBtClassChanged(device);
CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
if (cachedDevice != null) {
cachedDevice.refresh();
}
}
}
private class UuidChangedHandler implements Handler {
public void onReceive(Context context, Intent intent,
BluetoothDevice device) {
mDeviceManager.onUuidChanged(device);
CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
if (cachedDevice != null) {
cachedDevice.onUuidChanged();
}
}
}

14
packages/SettingsLib/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManager.java
View File

@@ -206,20 +206,6 @@ public class CachedBluetoothDeviceManager {
}
}
public synchronized void onBtClassChanged(BluetoothDevice device) {
CachedBluetoothDevice cachedDevice = findDevice(device);
if (cachedDevice != null) {
cachedDevice.dispatchAttributesChanged();
}
}
public synchronized void onUuidChanged(BluetoothDevice device) {
CachedBluetoothDevice cachedDevice = findDevice(device);
if (cachedDevice != null) {
cachedDevice.onUuidChanged();
}
}
public synchronized void onBluetoothStateChanged(int bluetoothState) {
// When Bluetooth is turning off, we need to clear the non-bonded devices
// Otherwise, they end up showing up on the next BT enable

15
packages/SettingsLib/tests/robotests/src/com/android/settingslib/bluetooth/CachedBluetoothDeviceManagerTest.java
View File

@@ -368,21 +368,6 @@ public class CachedBluetoothDeviceManagerTest {
verify(mHearingAidDeviceManager).updateHearingAidsDevices();
}
/**
* Test to verify onBtClassChanged().
*/
@Test
public void onBtClassChanged_validBtClass_classChanged() {
CachedBluetoothDevice cachedDevice1 = mCachedDeviceManager.addDevice(mDevice1);
assertThat(cachedDevice1).isNotNull();
assertThat(cachedDevice1.getBtClass()).isEqualTo(DEVICE_CLASS_1);
final BluetoothClass newBluetoothClass = DEVICE_CLASS_2;
when(mDevice1.getBluetoothClass()).thenReturn(newBluetoothClass);
mCachedDeviceManager.onBtClassChanged(mDevice1);
assertThat(cachedDevice1.getBtClass()).isEqualTo(newBluetoothClass);
}
/**
* Test to verify onDeviceDisappeared().
*/