Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f28608cd authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no... 

am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread

Merge commit 'c8d0d630' into gingerbread-plus-aosp

* commit 'c8d0d630':
  Fix issue 2909189: System property ro.audio.silent no longer mutes system.
parents 2835391c c8d0d630

services/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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();