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

am 356745ec: am 213d579f: Merge "Don\'t disconnect the same device before connecting." into gingerbread

Browse Source 
Merge commit '356745ecc63419a2569345186e8612a5b0ced28d'

* commit '356745ecc63419a2569345186e8612a5b0ced28d':
  Don't disconnect the same device before connecting.
This commit is contained in:
Jaikumar Ganesh
2010-09-16 23:24:15 -07:00
committed by Android Git Automerger
parent 3d64653d1f 356745ecc6
commit 69b0218849
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,10 +91,10 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
// See mConnectAttempted // See mConnectAttempted
private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000; private static final long MAX_UUID_DELAY_FOR_AUTO_CONNECT = 5000;
/** /**
* Describes the current device and profile for logging. * Describes the current device and profile for logging.
* *
* @param profile Profile to describe * @param profile Profile to describe
* @return Description of the device and profile * @return Description of the device and profile
*/ */
@@ -107,7 +107,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
return sb.toString(); return sb.toString();
} }
private String describe(Profile profile) { private String describe(Profile profile) {
return describe(this, profile); return describe(this, profile);
} }
@@ -264,7 +264,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
.getProfileManager(mLocalManager, profile); .getProfileManager(mLocalManager, profile);
if (profileManager.isPreferred(mDevice)) { if (profileManager.isPreferred(mDevice)) {
++preferredProfiles; ++preferredProfiles;
disconnectConnected(profile); disconnectConnected(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
} }
@@ -287,7 +287,7 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
.getProfileManager(mLocalManager, profile); .getProfileManager(mLocalManager, profile);
profileManager.setPreferred(mDevice, false); profileManager.setPreferred(mDevice, false);
disconnectConnected(profile); disconnectConnected(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
} }
@@ -297,19 +297,20 @@ public class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice>
mConnectAttempted = SystemClock.elapsedRealtime(); mConnectAttempted = SystemClock.elapsedRealtime();
// Reset the only-show-one-error-dialog tracking variable // Reset the only-show-one-error-dialog tracking variable
mIsConnectingErrorPossible = true; mIsConnectingErrorPossible = true;
disconnectConnected(profile); disconnectConnected(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
private void disconnectConnected(Profile profile) { private void disconnectConnected(CachedBluetoothDevice device, Profile profile) {
LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager profileManager =
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile); LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
CachedBluetoothDeviceManager cachedDeviceManager = mLocalManager.getCachedDeviceManager(); CachedBluetoothDeviceManager cachedDeviceManager = mLocalManager.getCachedDeviceManager();
Set<BluetoothDevice> devices = profileManager.getConnectedDevices(); Set<BluetoothDevice> devices = profileManager.getConnectedDevices();
if (devices == null) return; if (devices == null) return;
for (BluetoothDevice device : devices) { for (BluetoothDevice btDevice : devices) {
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(device); CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(btDevice);
if (cachedDevice != null) {
if (cachedDevice != null && !cachedDevice.equals(device)) {
disconnectInt(cachedDevice, profile); disconnectInt(cachedDevice, profile);
} }
} }