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

am: a57290a49d Change-Id: I515daf6e8d2042f950fcf152242de90be6545a33
2018-04-09 17:33:24 -07:00
parent 3a8ddbcc8a a57290a49d
commit 61caee3c04
1 changed files with 5 additions and 1 deletions
--- a/media/jni/soundpool/SoundPool.cpp
+++ b/media/jni/soundpool/SoundPool.cpp
@@ -809,7 +809,11 @@ void SoundChannel::play(const sp<Sample>& sample, int nextChannelID, float leftV
            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;