Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am: 61ad5ae921 am: c0d1f46845 (1d5aefd1) · Commits · e / os / android_frameworks_base

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ public class BluetoothEventManager {

		// Pairing broadcasts
		addHandler(BluetoothDevice.ACTION_BOND_STATE_CHANGED, new BondStateChangedHandler());
		addHandler(BluetoothDevice.ACTION_PAIRING_CANCEL, new PairingCancelHandler());

		// Fine-grained state broadcasts
		addHandler(BluetoothDevice.ACTION_CLASS_CHANGED, new ClassChangedHandler());
		@@ -344,24 +343,6 @@ public class BluetoothEventManager {
		}
		}

		private class PairingCancelHandler implements Handler {
		public void onReceive(Context context, Intent intent, BluetoothDevice device) {
		if (device == null) {
		Log.e(TAG, "ACTION_PAIRING_CANCEL with no EXTRA_DEVICE");
		return;
		}
		CachedBluetoothDevice cachedDevice = mDeviceManager.findDevice(device);
		if (cachedDevice == null) {
		Log.e(TAG, "ACTION_PAIRING_CANCEL with no cached device");
		return;
		}
		int errorMsg = R.string.bluetooth_pairing_error_message;
		if (context != null && cachedDevice != null) {
		Utils.showError(context, cachedDevice.getName(), errorMsg);
		}
		}
		}

		private class DockEventHandler implements Handler {
		public void onReceive(Context context, Intent intent, BluetoothDevice device) {
		// Remove if unpair device upon undocking