summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2010-08-13 08:00:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-13 08:00:14 -0700
commitc8d0d6307fc5cdd24083113456ac33790a5fb94a (patch)
treee4d9377fecbf0e8b9f90e476f2f7b6892c137b7a /services
parent686a95055896c221c62fe7f4c3dda137809df91e (diff)
parent8cc93b9b21310bd49d293152e4d68cedce8a72ef (diff)
downloadframeworks_base-c8d0d6307fc5cdd24083113456ac33790a5fb94a.zip
frameworks_base-c8d0d6307fc5cdd24083113456ac33790a5fb94a.tar.gz
frameworks_base-c8d0d6307fc5cdd24083113456ac33790a5fb94a.tar.bz2
Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioFlinger.cpp8
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();