Merge "Don't disconnect an A2DP device when connecting to same device"

2016-11-17 06:58:42 +00:00
parent a908e65b66 eb067ba741
commit 3ebcf1218b
1 changed files with 4 additions and 0 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
@@ -116,6 +116,10 @@ public final class A2dpProfile implements LocalBluetoothProfile {
        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);
            }
        }