commit 3f6ee1a180268ca2e30723ce2c45b81c2e671abb
author Eric Laurent <elaurent@google.com> Wed Nov 25 11:07:05 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 25 11:07:05 2009 -0800
tree 9250330bcf5a03f7844f52a62c2a89dc7a3d80f4
parent 694e8662a51bd878cd5630d47adaace471ea6f7c
parent 1565d2efc1fb3fde467cb42d67d921e9cf056381

am 1565d2ef: Merge change I4ad9ec48 into eclair-mr2

Merge commit '1565d2efc1fb3fde467cb42d67d921e9cf056381' into eclair-mr2-plus-aosp

* commit '1565d2efc1fb3fde467cb42d67d921e9cf056381':
  Fix A2dpAudioInterface getParameters.

libs/audioflinger/A2dpAudioInterface.cpp

diff --git a/libs/audioflinger/A2dpAudioInterface.cpp b/libs/audioflinger/A2dpAudioInterface.cpp
index 351815b..c07bbfe 100644
--- a/libs/audioflinger/A2dpAudioInterface.cpp
+++ b/libs/audioflinger/A2dpAudioInterface.cpp
@@ -185,7 +185,9 @@
     String8 keyValuePairs  = a2dpParam.toString();
 
     if (param.size()) {
-        keyValuePairs += ";";
+        if (keyValuePairs != "") {
+            keyValuePairs += ";";
+        }
         keyValuePairs += mHardwareInterface->getParameters(param.toString());
     }