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

Merge "Remove A2DP connect logic from settingslib" am: bd249a19bb

Browse Source 
am: 2b614b6ea9

Change-Id: Iea5dd7f438b8e25e1d8b67ae6be4c320e701d406
This commit is contained in:
Chienyuan
2018-08-16 17:36:23 -07:00
committed by android-build-merger
parent 4d618965f5 2b614b6ea9
commit 1bc55c7df5
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
View File

@@ -133,20 +133,6 @@ public class A2dpProfile implements LocalBluetoothProfile {
public boolean connect(BluetoothDevice device) {
if (mService == null) return false;
int max_connected_devices = mLocalAdapter.getMaxConnectedAudioDevices();
if (max_connected_devices == 1) {
// Original behavior: disconnect currently connected device
List<BluetoothDevice> sinks = getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
if (sink.equals(device)) {
Log.w(TAG, "Connecting to device " + device + " : disconnect skipped");
continue;
}
mService.disconnect(sink);
}
}
}
return mService.connect(device);
}

4
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothAdapter.java
View File

@@ -246,10 +246,6 @@ public class LocalBluetoothAdapter {
return mAdapter.getRemoteDevice(address);
}
public int getMaxConnectedAudioDevices() {
return mAdapter.getMaxConnectedAudioDevices();
}
public List<Integer> getSupportedProfiles() {
return mAdapter.getSupportedProfiles();
}