Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b am: c15cc348e8

am: ffb6a4beab

Change-Id: I2924dfe291a6a29620d4e22c47c32716516911e3

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);
             }
         }