Bluetooth: Ignore second connect request

If due to UI sluggishness or because of some faulty
third-party app triggering multiple connect requests,
frameworks receives two back to back connect requests
for the same device, ignore the second connect request
in frameworks itself.

Change-Id: I77de0c2bde91891260e6198b2236ca27d253b839

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
index 9608daa..b9fb5aa 100755 (executable)
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/A2dpProfile.java
@@ -116,7 +116,11 @@ public final class A2dpProfile implements LocalBluetoothProfile {
         List<BluetoothDevice> sinks = getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
-                mService.disconnect(sink);
+                if (sink.equals(device)) {
+                    // Connect to same device, Ignore it
+                    Log.d(TAG,"Not disconnecting device = " + sink);
+                    return true;
+                }
             }
         }
         return mService.connect(device);

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
index 5529866..6e1d4f0 100755 (executable)
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/HeadsetProfile.java
@@ -115,7 +115,11 @@ public final class HeadsetProfile implements LocalBluetoothProfile {
         List<BluetoothDevice> sinks = mService.getConnectedDevices();
         if (sinks != null) {
             for (BluetoothDevice sink : sinks) {
-                Log.d(TAG,"Not disconnecting device = " + sink);
+                if (sink.equals(device)) {
+                    // Connect to same device, Ignore it
+                    Log.d(TAG,"Not disconnecting device = " + sink);
+                    return true;
+                }
             }
         }
         return mService.connect(device);