diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-09-13 11:43:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-13 11:43:01 -0700 |
| commit | e714898a1abfd828a239e1be7b3f75e2a3cc2120 (patch) | |
| tree | 5467b9ffc0a1c1c59ddbad59de2e66bfdd74bb8c /src | |
| parent | e5e4282af1d2d4277c8e2c13a312be0187f44257 (diff) | |
| parent | a197eea30739f88be2d292ed4b7da99ec82ea315 (diff) | |
| download | packages_apps_Settings-e714898a1abfd828a239e1be7b3f75e2a3cc2120.zip packages_apps_Settings-e714898a1abfd828a239e1be7b3f75e2a3cc2120.tar.gz packages_apps_Settings-e714898a1abfd828a239e1be7b3f75e2a3cc2120.tar.bz2 | |
Merge "OutOfband pairing user dialog." into gingerbread
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothPairingDialog.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index 7004ba0..acbb99c 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -114,6 +114,8 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter } mPasskey = String.format("%06d", passkey); createDisplayPasskeyDialog(); + } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) { + createConsentDialog(); } else { Log.e(TAG, "Incorrect pairing type received, not showing any dialog"); } @@ -171,6 +173,9 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) { mPairingView.setVisibility(View.GONE); messageView.setText(getString(R.string.bluetooth_display_passkey_msg, name, mPasskey)); + } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) { + mPairingView.setVisibility(View.GONE); + messageView.setText(getString(R.string.bluetooth_incoming_pairing_msg, name)); } else { Log.e(TAG, "Incorrect pairing type received, not creating view"); } @@ -247,6 +252,8 @@ public class BluetoothPairingDialog extends AlertActivity implements DialogInter mDevice.setPairingConfirmation(true); } else if (mType == BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY) { // Do Nothing. + } else if (mType == BluetoothDevice.PAIRING_VARIANT_OOB_CONSENT) { + mDevice.setRemoteOutOfBandData(); } else { Log.e(TAG, "Incorrect pairing type received"); } |