Bluetooth Multi Connect
Allow automotive bluetooth profiles to connect to issue multiple connect
calls without disconnecting other devices. These client side profiles
either support multiple connections or handle multiple connection
requests gracefully.
Bug: 36789202
Test: Manual, Connect to one paired device then attempt to connect to a
second paired device, observe that HFP and PBAP are both connected on
both devices.
Change-Id: I8bd6aea2b8411ba5585b34292d8c6ec62c5c2f96
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java
index 77f2e19..a1c8de5 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java
@@ -122,9 +122,6 @@
return true;
}
}
- for (BluetoothDevice src : srcs) {
- mService.disconnect(src);
- }
}
return mService.connect(device);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
index 9b699bc..169aac9 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
@@ -132,11 +132,6 @@
return true;
}
}
- // Handsfree HF only supports one source connection and hence it is OK to disconnect
- // the only connected device here.
- for (BluetoothDevice src : srcs) {
- mService.disconnect(src);
- }
}
return mService.connect(device);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
index a7621fc..6efa468 100644
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
@@ -115,10 +115,10 @@
public boolean connect(BluetoothDevice device) {
if (mService == null) return false;
List<BluetoothDevice> connectedDevices = getConnectedDevices();
- if (connectedDevices != null) {
- for (BluetoothDevice connectedDevice : connectedDevices) {
- mService.disconnect(connectedDevice);
- }
+ if (connectedDevices != null && connectedDevices.contains(device)) {
+ // Connect to same device, Ignore it
+ Log.d(TAG,"Ignoring Connect");
+ return true;
}
return mService.connect(device);
}
diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
index 72a3b3a..bd37abe 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
@@ -144,9 +144,6 @@
return true;
}
}
- for (BluetoothDevice src : srcs) {
- mService.disconnect(src);
- }
}
Log.d(TAG,"PBAPClientProfile attempting to connect to " + device.getAddress());