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

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

Browse Source
This commit is contained in:
Eric Fischer
2009-10-08 17:52:42 -07:00
committed by Android Git Automerger
parent 875a034b6e a8d752069c
commit 978a951293
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;