commit 5883e00056b87f847a5005159e36d09888c787bb
author Linux Build Service Account <lnxbuild@localhost> Wed Mar 02 07:15:19 2016 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Mar 02 07:15:19 2016 -0800
tree 79fc1e29c457918a28a8a0fcd3898adf97f191f5
parent 4d96646ccc0c27f4d0fe060600d474b9d206a8aa
parent fccb9153f3a93dcddcb4cf201675002ddb50aaf6

Merge "audiopolicy: do not set FM volume during device connection/disconnection" into av-userspace.lnx.1.0-dev.1.0

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 3c3686f..dee4e8b 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -291,9 +291,6 @@
                mPrimaryOutput->changeRefCount(AUDIO_STREAM_MUSIC, -1);
            }
            AudioParameter param = AudioParameter();
-           float volumeDb = mPrimaryOutput->mCurVolume[AUDIO_STREAM_MUSIC];
-           mPrevFMVolumeDb = volumeDb;
-           param.addFloat(String8("fm_volume"), Volume::DbToAmpl(volumeDb));
            param.addInt(String8("handle_fm"), (int)newDevice);
            mpClientInterface->setParameters(mPrimaryOutput->mIoHandle, param.toString());
         }