diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-10-08 08:06:27 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-10-08 08:06:27 -0700 |
| commit | c065348ebaf1ea9301d7b96633bea4de8c78c2aa (patch) | |
| tree | beb514221de5ef79de967c2228dc3080d06511b7 /src/com | |
| parent | d1a04291c537e271999c7e7c5c72f1f61632aacf (diff) | |
| download | packages_apps_settings-c065348ebaf1ea9301d7b96633bea4de8c78c2aa.zip packages_apps_settings-c065348ebaf1ea9301d7b96633bea4de8c78c2aa.tar.gz packages_apps_settings-c065348ebaf1ea9301d7b96633bea4de8c78c2aa.tar.bz2 | |
Show an error message when the remote side cancels the authentication
and show OPP device list correctly.
Dr No: Eastham
Bug: 2174874
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/bluetooth/BluetoothSettings.java | 6 | ||||
| -rw-r--r-- | src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 4175a82..48f2a05 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -323,12 +323,10 @@ public class BluetoothSettings extends PreferenceActivity switch(mFilterType) { case BluetoothDevicePicker.FILTER_TYPE_TRANSFER: - if (uuids != null) { + if (uuids != null) if (BluetoothUuid.containsAnyUuid(uuids, LocalBluetoothProfileManager.OPP_PROFILE_UUIDS)) return true; - } else { - if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true; - } + if (bluetoothClass.doesClassMatch(BluetoothClass.PROFILE_OPP)) return true; break; case BluetoothDevicePicker.FILTER_TYPE_AUDIO: if (uuids != null) { diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java index 1214636..c3dfc20 100644 --- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java +++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java @@ -216,6 +216,7 @@ public class CachedBluetoothDeviceManager { case BluetoothDevice.UNBOND_REASON_DISCOVERY_IN_PROGRESS: case BluetoothDevice.UNBOND_REASON_AUTH_TIMEOUT: case BluetoothDevice.UNBOND_REASON_REPEATED_ATTEMPTS: + case BluetoothDevice.UNBOND_REASON_REMOTE_AUTH_CANCELED: errorMsg = R.string.bluetooth_pairing_error_message; mLocalManager.showError(device, R.string.bluetooth_error_title, errorMsg); break; |