Merge "Remove obsolete code in BluetoothEventMangaer" (d821df2b) · Commits · e / os / android_frameworks_base

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

+4 −14

Original line number	Diff line number	Diff line
		@@ -149,8 +149,7 @@ public class BluetoothEventManager {
		for (BluetoothDevice device : bondedDevices) {
		CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
		if (cachedDevice == null) {
		cachedDevice = mDeviceManager.addDevice(device);
		dispatchDeviceAdded(cachedDevice);
		mDeviceManager.addDevice(device);
		deviceAdded = true;
		}
		}
		@@ -337,19 +336,10 @@ public class BluetoothEventManager {
		int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
		BluetoothDevice.ERROR);
		CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
		if (cachedDevice == null) {
		Log.w(TAG, "CachedBluetoothDevice for device " + device +
		" not found, calling readPairedDevices().");
		if (readPairedDevices()) {
		cachedDevice = mDeviceManager.findDevice(device);
		}

		if (cachedDevice == null) {
		Log.w(TAG, "Got bonding state changed for " + device +
		", but we have no record of that device.");
		cachedDevice = mDeviceManager.addDevice(device);
		dispatchDeviceAdded(cachedDevice);
		}
		}

		synchronized (mCallbacks) {