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

Commit 69d7878a authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "AudioPolicy: do not cap a11y volume during call screening" into qt-r1-dev 

am: 7ec1eafe

Change-Id: I5bc502a8c200f00fcae2926913378ca65bb57367
parents 363be082 7ec1eafe

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −3
Original line number Diff line number Diff line
@@ -5689,8 +5689,9 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
    const auto ringVolumeSrc = toVolumeSource(AUDIO_STREAM_RING);

    const auto musicVolumeSrc = toVolumeSource(AUDIO_STREAM_MUSIC);

    const auto alarmVolumeSrc = toVolumeSource(AUDIO_STREAM_ALARM);

    const auto a11yVolumeSrc = toVolumeSource(AUDIO_STREAM_ACCESSIBILITY);



    if (volumeSource == toVolumeSource(AUDIO_STREAM_ACCESSIBILITY)

    if (volumeSource == a11yVolumeSrc

            && (AUDIO_MODE_RINGTONE == mEngine->getPhoneState()) &&

            mOutputs.isActive(ringVolumeSrc, 0)) {

        auto &ringCurves = getVolumeCurves(AUDIO_STREAM_RING);
@@ -5707,7 +5708,7 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
             volumeSource == toVolumeSource(AUDIO_STREAM_NOTIFICATION) ||

             volumeSource == toVolumeSource(AUDIO_STREAM_ENFORCED_AUDIBLE) ||

             volumeSource == toVolumeSource(AUDIO_STREAM_DTMF) ||

             volumeSource == toVolumeSource(AUDIO_STREAM_ACCESSIBILITY))) {

             volumeSource == a11yVolumeSrc)) {

        auto &voiceCurves = getVolumeCurves(callVolumeSrc);

        int voiceVolumeIndex = voiceCurves.getVolumeIndex(device);

        const float maxVoiceVolDb =
@@ -5719,7 +5720,9 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
        // VOICE_CALL stream has minVolumeIndex > 0 : Users cannot set the volume of voice calls to

        // 0. We don't want to cap volume when the system has programmatically muted the voice call

        // stream. See setVolumeCurveIndex() for more information.

        bool exemptFromCapping = (volumeSource == ringVolumeSrc) && (voiceVolumeIndex == 0);

        bool exemptFromCapping =

                ((volumeSource == ringVolumeSrc) || (volumeSource == a11yVolumeSrc))

                && (voiceVolumeIndex == 0);

        ALOGV_IF(exemptFromCapping, "%s volume source %d at vol=%f not capped", __func__,

                 volumeSource, volumeDb);

        if ((volumeDb > maxVoiceVolDb) && !exemptFromCapping) {