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

Commit 80838d25 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge 0ef57993 from gingerbread 

Change-Id: If10fee1ae387a8130356dd62fe678495402d5edf
parents a8d5dbbc 0ef57993

services/audioflinger/AudioPolicyManagerBase.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1835,7 +1835,8 @@ float AudioPolicyManagerBase::computeVolume(int stream, int index, audio_io_hand 
        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE |

        AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET |

        AudioSystem::DEVICE_OUT_DGTL_DOCK_HEADSET)) &&

        (getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) &&

        ((getStrategy((AudioSystem::stream_type)stream) == STRATEGY_SONIFICATION) ||

         (stream == AudioSystem::SYSTEM)) &&

        streamDesc.mCanBeMuted) {

        volume *= SONIFICATION_HEADSET_VOLUME_FACTOR;

        // when the phone is ringing we must consider that music could have been paused just before