Show error messages when Authentication fails.
Call Canceled when user presses "Don't Pair".
Thus for Authentication Failed cases we can show the message to the
user.
diff --git a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
index 758ccf8..fdc217a 100644
--- a/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventRedirector.java
@@ -80,6 +80,7 @@
if (bondState == BluetoothDevice.BOND_NOT_BONDED) {
int reason = intent.getIntExtra(BluetoothIntent.REASON, BluetoothError.ERROR);
if (reason == BluetoothDevice.UNBOND_REASON_AUTH_REJECTED ||
+ reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED ||
reason == BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN) {
mManager.getCachedDeviceManager().onBondingError(device, reason);
}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 86ace34..1e0da90 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -230,11 +230,7 @@
}
private void onCancel() {
- if (mType == BluetoothDevice.PAIRING_VARIANT_CONFIRMATION) {
- mDevice.setPairingConfirmation(false);
- } else {
- mDevice.cancelPairingUserInput();
- }
+ mDevice.cancelPairingUserInput();
}
public void onClick(DialogInterface dialog, int which) {