commit d8f72540a4a792718cd7a46a9348c3face19baf6
author Eric Laurent <elaurent@google.com> Thu Aug 04 16:03:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 04 16:03:57 2016 +0000
tree 1ded413851a46afce0fd9e51ec71fbacec43e21a
parent bdcffab6a8c6d0d52888e9cdc38bd6162e3cae70
parent 631a40a343fb4bf21414fd5b62ef59590e6cdcdc

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

Change-Id: I1f6b3e9a042a1c66ae2d2b91247432ecb61f7162

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()