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

Show an error message when the remote side cancels the authentication

Browse Source 
and show OPP device list correctly.

Dr No: Eastham
Bug: 2174874
This commit is contained in:
Jaikumar Ganesh
2009-10-08 08:06:27 -07:00
parent d1a04291c5
commit c065348eba
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) {

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

@@ -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;