Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bluetooth Multi Connect" into oc-dev

Browse Source
This commit is contained in:
Joseph Pirozzo
2017-04-06 15:19:24 +00:00
committed by Android (Google) Code Review
parent 9a8f641801 11b1b06973
commit 3c0f1f1aa2
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpSinkProfile.java
View File

@@ -122,9 +122,6 @@ final class A2dpSinkProfile implements LocalBluetoothProfile {
return true;
}
}
for (BluetoothDevice src : srcs) {
mService.disconnect(src);
}
}
return mService.connect(device);
}

5
packages/SettingsLib/src/com/android/settingslib/bluetooth/HfpClientProfile.java
View File

@@ -132,11 +132,6 @@ final class HfpClientProfile implements LocalBluetoothProfile {
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);
}

8
packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java
View File

@@ -115,10 +115,10 @@ public final class MapClientProfile implements LocalBluetoothProfile {
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);
}

3
packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java
View File

@@ -144,9 +144,6 @@ final class PbapClientProfile implements LocalBluetoothProfile {
return true;
}
}
for (BluetoothDevice src : srcs) {
mService.disconnect(src);
}
}
Log.d(TAG,"PBAPClientProfile attempting to connect to " + device.getAddress());