commit a57290a49d76d156e7234049702acdfa7dce3cc0
author Eric Laurent <elaurent@google.com> Mon Apr 09 23:26:35 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 23:26:35 2018 +0000
tree eb845a4b8c6a42e620d53f227bf8b2db34d6c42d
parent 9dbe4d8e6b976209155306775ed5a0a744af1343
parent 9bc88b378cf2f1953a08b2df11c58223e8eb2f23

Merge "soundpool: fix muted channel" into pi-dev

media/jni/soundpool/SoundPool.cpp

diff --git a/media/jni/soundpool/SoundPool.cpp b/media/jni/soundpool/SoundPool.cpp
index b4ca88c..ed2afdd 100644
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -809,7 +809,11 @@
             mAudioTrack = newTrack;
             ALOGV("using new track %p for sample %d", newTrack.get(), sample->sampleID());
         }
-        newTrack->setVolume(leftVolume, rightVolume);
+        if (mMuted) {
+            newTrack->setVolume(0.0f, 0.0f);
+        } else {
+            newTrack->setVolume(leftVolume, rightVolume);
+        }
         newTrack->setLoop(0, frameCount, loop);
         mPos = 0;
         mSample = sample;