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

am 978a9512: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Settings into eclair-mr2-plus-aosp

Browse Source 
Merge commit '978a95129323da61aaf2dc0d39302ae0cb043ba2'

* commit '978a95129323da61aaf2dc0d39302ae0cb043ba2':
  Show an error message when the remote side cancels the authentication
  Import revised translations.  DO NOT MERGE
This commit is contained in:
Eric Fischer
2009-10-13 12:04:33 -07:00
committed by Android Git Automerger
parent bbd0415911 978a951293
commit 0c8848e273
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

@@ -329,12 +329,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;