commit 8c3c46b79524ee9eb096e458f1713c4def04a3f0
author Eric Laurent <elaurent@google.com> Thu Aug 04 22:06:54 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 04 22:06:54 2016 +0000
tree ba4571995dc113a186a71dc5670399eafff9cad0
parent c23aecc0b2d29eee6f34dc23a508c3d158f2c3ed
parent 5f5fca540ce22d2f9caff1c823b2d5b637904729

audio policy: fix call volume over USB
am: 5f5fca540c

Change-Id: I5be42e32f48cadcd2c635fe65506928ea757a4da

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