diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-08-24 10:57:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-24 10:57:48 -0700 |
| commit | c1d569573266402deda5d87521b677c4f11a596e (patch) | |
| tree | 1c7ac555b6d565dfb7398d81fe810cfc3b62e672 | |
| parent | 26114eb290bb96b34c5d25a8cf979852f89dfe93 (diff) | |
| parent | 244080159b0ddb66906cbfcdc2b782c4f55108d7 (diff) | |
| download | packages_apps_Settings-c1d569573266402deda5d87521b677c4f11a596e.zip packages_apps_Settings-c1d569573266402deda5d87521b677c4f11a596e.tar.gz packages_apps_Settings-c1d569573266402deda5d87521b677c4f11a596e.tar.bz2 | |
am 24408015: Merge change 22303 into eclair
Merge commit '244080159b0ddb66906cbfcdc2b782c4f55108d7'
* commit '244080159b0ddb66906cbfcdc2b782c4f55108d7':
Show error messages when Authentication fails.
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothEventRedirector.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothPairingDialog.java | 6 |
2 files changed, 2 insertions, 5 deletions
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 @@ public class BluetoothEventRedirector { 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 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter } private void onCancel() { - if (mType == BluetoothDevice.PAIRING_VARIANT_CONFIRMATION) { - mDevice.setPairingConfirmation(false); - } else { - mDevice.cancelPairingUserInput(); - } + mDevice.cancelPairingUserInput(); } public void onClick(DialogInterface dialog, int which) { |