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

Merge "Allow multiple simultaneous connections for BT input devices." into honeycomb

Browse Source
This commit is contained in:
Jake Hamby
2011-01-11 18:44:57 -08:00
committed by Android (Google) Code Review
parent 77057e282b a0d39a39c2
commit 055c20e576
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -279,7 +279,7 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
} }
private void connectWithoutResettingTimer(boolean connectAllProfiles) { private void connectWithoutResettingTimer(boolean connectAllProfiles) {
// Try to initialize the profiles if there were not. // Try to initialize the profiles if they were not.
if (mProfiles.size() == 0) { if (mProfiles.size() == 0) {
if (!updateProfiles()) { if (!updateProfiles()) {
// If UUIDs are not available yet, connect will be happen // If UUIDs are not available yet, connect will be happen
@@ -299,7 +299,6 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
.getProfileManager(mLocalManager, profile); .getProfileManager(mLocalManager, profile);
if (profileManager.isPreferred(mDevice)) { if (profileManager.isPreferred(mDevice)) {
++preferredProfiles; ++preferredProfiles;
disconnectConnected(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
} }
@@ -322,7 +321,6 @@ class CachedBluetoothDevice implements Comparable<CachedBluetoothDevice> {
LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager LocalBluetoothProfileManager profileManager = LocalBluetoothProfileManager
.getProfileManager(mLocalManager, profile); .getProfileManager(mLocalManager, profile);
profileManager.setPreferred(mDevice, true); profileManager.setPreferred(mDevice, true);
disconnectConnected(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
} }
@@ -332,25 +330,9 @@ 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(this, profile);
connectInt(this, profile); connectInt(this, profile);
} }
private void disconnectConnected(CachedBluetoothDevice device, Profile profile) {
LocalBluetoothProfileManager profileManager =
LocalBluetoothProfileManager.getProfileManager(mLocalManager, profile);
CachedBluetoothDeviceManager cachedDeviceManager = mLocalManager.getCachedDeviceManager();
List<BluetoothDevice> devices = profileManager.getConnectedDevices();
if (devices == null) return;
for (BluetoothDevice btDevice : devices) {
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(btDevice);
if (cachedDevice != null && !cachedDevice.equals(device)) {
cachedDevice.disconnect(profile);
}
}
}
private boolean connectInt(CachedBluetoothDevice cachedDevice, Profile profile) { private boolean connectInt(CachedBluetoothDevice cachedDevice, Profile profile) {
if (!cachedDevice.ensurePaired()) return false; if (!cachedDevice.ensurePaired()) return false;

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

@@ -471,6 +471,12 @@ abstract class LocalBluetoothProfileManager {
@Override @Override
public boolean connect(BluetoothDevice device) { public boolean connect(BluetoothDevice device) {
List<BluetoothDevice> sinks = getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
mService.disconnect(sink);
}
}
return mService.connect(device); return mService.connect(device);
} }
@@ -727,6 +733,12 @@ abstract class LocalBluetoothProfileManager {
@Override @Override
public boolean connect(BluetoothDevice device) { public boolean connect(BluetoothDevice device) {
List<BluetoothDevice> sinks = getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
mService.disconnect(sink);
}
}
return mService.connect(device); return mService.connect(device);
} }