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

am 7bf9e031: Merge change Ie7e8a7ef into eclair

Browse Source 
Merge commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e' into eclair-plus-aosp

* commit '7bf9e0317cfb62b12e99ed9ab6c6975c848c519e':
  Don't auto-connect to OPP after pairing
This commit is contained in:
Michael Chan
2009-10-01 07:54:39 -07:00
committed by Android Git Automerger
parent 7c8a08d513 7bf9e0317c
commit 93979854db
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,13 +396,15 @@ 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
.getProfileManager(mLocalManager, profile);
if (profileManager.isPreferred(mDevice)) { if (profileManager.isPreferred(mDevice)) {
++preferredProfiles; ++preferredProfiles;
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile)); queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
} }
} }
}
if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles); if (DEBUG) Log.d(TAG, "Preferred profiles = " + preferredProfiles);
if (preferredProfiles == 0) { if (preferredProfiles == 0) {
@@ -417,12 +419,14 @@ 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
.getProfileManager(mLocalManager, profile);
profileManager.setPreferred(mDevice, false); profileManager.setPreferred(mDevice, false);
queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile)); queueCommand(new BluetoothJob(BluetoothCommand.CONNECT, this, profile));
} }
} }
}
public void connect(Profile profile) { public void connect(Profile profile) {
mConnectAttempted = SystemClock.elapsedRealtime(); mConnectAttempted = SystemClock.elapsedRealtime();