Merge "Fix deadlock in LocalBluetoothManager" (05ddacce) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}
		}

+0 −14

Original line number	Diff line number	Diff line
		@@ -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

+0 −15

Original line number	Diff line number	Diff line
		@@ -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().
		*/