Merge "policy_hal: fix for volume burst during FM device switch" into av-userspace.lnx.1.0-dev.1.0
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index ac814cd..26e2929 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1277,7 +1277,8 @@
             mPrevFMVolumeDb = volumeDb;
             AudioParameter param = AudioParameter();
             param.addFloat(String8("fm_volume"), Volume::DbToAmpl(volumeDb));
-            mpClientInterface->setParameters(mPrimaryOutput->mIoHandle, param.toString(), delayMs);
+            //Double delayMs to avoid sound burst while device switch.
+            mpClientInterface->setParameters(mPrimaryOutput->mIoHandle, param.toString(), delayMs*2);
         }
 #endif /* FM_POWER_OPT end */
     }