Merge change I80790bdb into eclair

* changes:
  b/2296110 Dialog for setting up dock audio.
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 4078131..b488c22 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -168,12 +168,12 @@
 
         @Override
         public Set<BluetoothDevice> getConnectedDevices() {
-            return mService.getConnectedSinks();
+            return mService.getNonDisconnectedSinks();
         }
 
         @Override
         public boolean connect(BluetoothDevice device) {
-            Set<BluetoothDevice> sinks = mService.getConnectedSinks();
+            Set<BluetoothDevice> sinks = mService.getNonDisconnectedSinks();
             if (sinks != null) {
                 for (BluetoothDevice sink : sinks) {
                     mService.disconnectSink(sink);