am 3b591260: Fix issue 2604270 Device auto connects to Car Dock (Media profile) after undocking.

Merge commit '3b5912602bec6ccbe8eef8a576730b1565f0067c' into froyo-plus-aosp

* commit '3b5912602bec6ccbe8eef8a576730b1565f0067c':
  Fix issue 2604270  Device auto connects to Car Dock (Media profile) after undocking.

media/java/android/media/AudioService.java

@@ -1728,6 +1728,9 @@ public class AudioService extends IAudioService.Stub {
     }
 
     private void makeA2dpDeviceUnavailableLater(String address) {
+        // prevent any activity on the A2DP audio output to avoid unwanted
+        // reconnection of the sink.
+        AudioSystem.setParameters("A2dpSuspended=true");
         // the device will be made unavailable later, so consider it disconnected right away
         mConnectedDevices.remove(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP);
         // send the delayed message to make the device unavailable later