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

Commit 86903e06 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by jiabin
Browse files

AudioPolicy: do not cap a11y volume during call screening 

  Add accessibility playback as exemption for volume capping
during call screening.

Bug: 133879660
Test: enable Talkback, receive a call, screen it, touch responses icons,
verify labels are read

Change-Id: I661a544261ef57e439b3eb8cf3d1dde1c31ac303
Merged-In: I661a544261ef57e439b3eb8cf3d1dde1c31ac303
parent 4f0a23d0

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −3
Original line number Diff line number Diff line
@@ -5695,8 +5695,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);
@@ -5713,7 +5714,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 =
@@ -5725,7 +5726,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) {