commit 3fdee335fe95ab94ef1ee619ad37f9369447fde5
author Eric Laurent <elaurent@google.com> Wed Nov 25 11:17:03 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 25 11:17:03 2009 -0800
tree 14facf2ff590893151732de04db32ffa883bd529
parent be02501de757eeee382d8bebcbf23f3251244292
parent 3f6ee1a180268ca2e30723ce2c45b81c2e671abb

am 3f6ee1a1: am 1565d2ef: Merge change I4ad9ec48 into eclair-mr2

Merge commit '3f6ee1a180268ca2e30723ce2c45b81c2e671abb'

* commit '3f6ee1a180268ca2e30723ce2c45b81c2e671abb':
  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());
     }