PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 22303 into eclair

Browse Source 
* changes:
  Show error messages when Authentication fails.
This commit is contained in:
Android (Google) Code Review
2009-08-24 10:53:27 -07:00
parent a97d794825 cb6a3b3d9e
commit 244080159b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/bluetooth/BluetoothEventRedirector.java
View File

@@ -80,6 +80,7 @@ public class BluetoothEventRedirector {
if (bondState == BluetoothDevice.BOND_NOT_BONDED) { if (bondState == BluetoothDevice.BOND_NOT_BONDED) {
int reason = intent.getIntExtra(BluetoothIntent.REASON, BluetoothError.ERROR); int reason = intent.getIntExtra(BluetoothIntent.REASON, BluetoothError.ERROR);
if (reason == BluetoothDevice.UNBOND_REASON_AUTH_REJECTED || if (reason == BluetoothDevice.UNBOND_REASON_AUTH_REJECTED ||
reason == BluetoothDevice.UNBOND_REASON_AUTH_FAILED ||
reason == BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN) { reason == BluetoothDevice.UNBOND_REASON_REMOTE_DEVICE_DOWN) {
mManager.getCachedDeviceManager().onBondingError(device, reason); mManager.getCachedDeviceManager().onBondingError(device, reason);
} }

6
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -230,11 +230,7 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter
} }
private void onCancel() { private void onCancel() {
if (mType == BluetoothDevice.PAIRING_VARIANT_CONFIRMATION) { mDevice.cancelPairingUserInput();
mDevice.setPairingConfirmation(false);
} else {
mDevice.cancelPairingUserInput();
}
} }
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {