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

Commit 0ef57993 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Fix issue 2988031." into gingerbread

parents 226e5756 111df679

services/audioflinger/AudioPolicyManagerBase.cpp

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

        AudioSystem::DEVICE_OUT_WIRED_HEADSET |

        AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) &&

        (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