Merge "Remove BluetoothDevice.ACTION_DISAPPEARED" (cf117607) · Commits · e / os / android_frameworks_base

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

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -97,7 +97,6 @@ public class BluetoothEventManager {
	addHandler(BluetoothAdapter.ACTION_DISCOVERY_STARTED, new ScanningStateChangedHandler(true));		addHandler(BluetoothAdapter.ACTION_DISCOVERY_STARTED, new ScanningStateChangedHandler(true));
	addHandler(BluetoothAdapter.ACTION_DISCOVERY_FINISHED, new ScanningStateChangedHandler(false));		addHandler(BluetoothAdapter.ACTION_DISCOVERY_FINISHED, new ScanningStateChangedHandler(false));
	addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());		addHandler(BluetoothDevice.ACTION_FOUND, new DeviceFoundHandler());
	addHandler(BluetoothDevice.ACTION_DISAPPEARED, new DeviceDisappearedHandler());
	addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());		addHandler(BluetoothDevice.ACTION_NAME_CHANGED, new NameChangedHandler());
	addHandler(BluetoothDevice.ACTION_ALIAS_CHANGED, new NameChangedHandler());		addHandler(BluetoothDevice.ACTION_ALIAS_CHANGED, new NameChangedHandler());

	@@ -280,24 +279,6 @@ public class BluetoothEventManager {
	}		}
	}		}

	private class DeviceDisappearedHandler implements Handler {
	public void onReceive(Context context, Intent intent,
	BluetoothDevice device) {
	CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
	if (cachedDevice == null) {
	Log.w(TAG, "received ACTION_DISAPPEARED for an unknown device: " + device);
	return;
	}
	if (CachedBluetoothDeviceManager.onDeviceDisappeared(cachedDevice)) {
	synchronized (mCallbacks) {
	for (BluetoothCallback callback : mCallbacks) {
	callback.onDeviceDeleted(cachedDevice);
	}
	}
	}
	}
	}

	private class NameChangedHandler implements Handler {		private class NameChangedHandler implements Handler {
	public void onReceive(Context context, Intent intent,		public void onReceive(Context context, Intent intent,
	BluetoothDevice device) {		BluetoothDevice device) {