diff options
| author | Eric Laurent <elaurent@google.com> | 2010-08-13 08:06:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-13 08:06:23 -0700 |
| commit | f28608cdf4f6a0075d0811ccd32123baf4daec31 (patch) | |
| tree | 5c49f0436f8aa38789704fa25689fd78f6bc0761 /services | |
| parent | 2835391c1709a2b655940200dab0fc74ef08512d (diff) | |
| parent | c8d0d6307fc5cdd24083113456ac33790a5fb94a (diff) | |
| download | frameworks_base-f28608cdf4f6a0075d0811ccd32123baf4daec31.zip frameworks_base-f28608cdf4f6a0075d0811ccd32123baf4daec31.tar.gz frameworks_base-f28608cdf4f6a0075d0811ccd32123baf4daec31.tar.bz2 | |
am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp
* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 1c7faa4..6e7633e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1675,6 +1675,9 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track float masterVolume = mMasterVolume; bool masterMute = mMasterMute; + if (masterMute) { + masterVolume = 0; + } #ifdef LVMX bool tracksConnectedChanged = false; bool stateChanged = false; @@ -1696,10 +1699,7 @@ uint32_t AudioFlinger::MixerThread::prepareTracks_l(const SortedVector< wp<Track // Delegate master volume control to effect in output mix effect chain if needed sp<EffectChain> chain = getEffectChain_l(AudioSystem::SESSION_OUTPUT_MIX); if (chain != 0) { - uint32_t v = 0; - if (!masterMute) { - v = (uint32_t)(masterVolume * (1 << 24)); - } + uint32_t v = (uint32_t)(masterVolume * (1 << 24)); chain->setVolume_l(&v, &v); masterVolume = (float)((v + (1 << 23)) >> 24); chain.clear(); |