commit 631a40a343fb4bf21414fd5b62ef59590e6cdcdc
author Eric Laurent <elaurent@google.com> Thu Aug 04 15:55:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 04 15:55:58 2016 +0000
tree 9d6653478a9861447c72bd79e116fded5e963666
parent 38ee5ebf5f55cc4c143e817702b5a758d09a9bc8
parent c23aecc0b2d29eee6f34dc23a508c3d158f2c3ed

audioflinger: fix effect volume set on start. am: e7449bf60c
am: c23aecc0b2

Change-Id: I764c5ef445b595d73e8efb12b3e240d7f214e486

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 4cde70d..e3e518c 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1733,9 +1733,11 @@
 // resetVolume_l() must be called with PlaybackThread::mLock or EffectChain::mLock held
 void AudioFlinger::EffectChain::resetVolume_l()
 {
-    uint32_t left = mLeftVolume;
-    uint32_t right = mRightVolume;
-    (void)setVolume_l(&left, &right, true);
+    if ((mLeftVolume != UINT_MAX) && (mRightVolume != UINT_MAX)) {
+        uint32_t left = mLeftVolume;
+        uint32_t right = mRightVolume;
+        (void)setVolume_l(&left, &right, true);
+    }
 }
 
 void AudioFlinger::EffectChain::syncHalEffectsState()