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

Merge change Ie7e8a7ef into eclair

Browse Source 
* changes:
  Don't auto-connect to OPP after pairing
This commit is contained in:
Android (Google) Code Review
2009-10-01 10:46:26 -04:00
parent ee52bed514 b547dda338
commit 7bf9e0317c
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/bluetooth/CachedBluetoothDevice.java
View File

@@ -396,11 +396,13 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
int preferredProfiles = 0; int preferredProfiles = 0;
for (Profile profile : mProfiles) { for (Profile profile : mProfiles) {
LocalBluetoothProfileManager profileManager = if (isConnectableProfile(profile)) {
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
if (profileManager.isPreferred(mDevice)) { .getProfileManager(mLocalManager, profile);
++preferredProfiles; if (profileManager.isPreferred(mDevice)) {
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile)); ++preferredProfiles;
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
}
} }
} }
if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles); if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
@@ -417,10 +419,12 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
mIsConnectingErrorPossible = true; mIsConnectingErrorPossible = true;
for (Profile profile : mProfiles) { for (Profile profile : mProfiles) {
LocalBluetoothProfileManager profileManager = if (isConnectableProfile(profile)) {
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
profileManager.setPreferred(mDevice, false); .getProfileManager(mLocalManager, profile);
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile)); profileManager.setPreferred(mDevice, false);
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
}
} }
} }