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

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

Merge "audio policy: add call redirection audio modes"

parents 4809e256 c8c4f1f6

media/libaudioclient/AidlConversion.cpp

+8 −0
Original line number Diff line number Diff line
@@ -3033,6 +3033,10 @@ aidl2legacy_AudioMode_audio_mode_t(AudioMode aidl) { 
            return AUDIO_MODE_IN_COMMUNICATION;

        case AudioMode::CALL_SCREEN:

            return AUDIO_MODE_CALL_SCREEN;

        case AudioMode::SYS_RESERVED_CALL_REDIRECT:

            return AUDIO_MODE_CALL_REDIRECT;

        case AudioMode::SYS_RESERVED_COMMUNICATION_REDIRECT:

            return AUDIO_MODE_COMMUNICATION_REDIRECT;

    }

    return unexpected(BAD_VALUE);

}
@@ -3054,6 +3058,10 @@ legacy2aidl_audio_mode_t_AudioMode(audio_mode_t legacy) { 
            return AudioMode::IN_COMMUNICATION;

        case AUDIO_MODE_CALL_SCREEN:

            return AudioMode::CALL_SCREEN;

        case AUDIO_MODE_CALL_REDIRECT:

            return AudioMode::SYS_RESERVED_CALL_REDIRECT;

        case AUDIO_MODE_COMMUNICATION_REDIRECT:

            return AudioMode::SYS_RESERVED_COMMUNICATION_REDIRECT;

        case AUDIO_MODE_CNT:

            break;

    }

media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ constexpr audio_unique_id_use_t kUniqueIds[] = { 


constexpr audio_mode_t kModes[] = {

    AUDIO_MODE_INVALID, AUDIO_MODE_CURRENT,          AUDIO_MODE_NORMAL,     AUDIO_MODE_RINGTONE,

    AUDIO_MODE_IN_CALL, AUDIO_MODE_IN_COMMUNICATION, AUDIO_MODE_CALL_SCREEN};

    AUDIO_MODE_IN_CALL, AUDIO_MODE_IN_COMMUNICATION, AUDIO_MODE_CALL_SCREEN,

    AUDIO_MODE_CALL_REDIRECT, AUDIO_MODE_COMMUNICATION_REDIRECT};



constexpr audio_session_t kSessionId[] = {AUDIO_SESSION_NONE, AUDIO_SESSION_OUTPUT_STAGE,

                                          AUDIO_SESSION_DEVICE};

media/libmediahelper/TypeConverter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ const AudioModeConverter::Table AudioModeConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_MODE_IN_CALL),

    MAKE_STRING_FROM_ENUM(AUDIO_MODE_IN_COMMUNICATION),

    MAKE_STRING_FROM_ENUM(AUDIO_MODE_CALL_SCREEN),

    MAKE_STRING_FROM_ENUM(AUDIO_MODE_CALL_REDIRECT),

    MAKE_STRING_FROM_ENUM(AUDIO_MODE_COMMUNICATION_REDIRECT),

    TERMINATOR

};

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −6
Original line number Diff line number Diff line
@@ -6937,8 +6937,8 @@ bool AudioPolicyManager::isCallAudioAccessible() 
{

    audio_mode_t mode = mEngine->getPhoneState();

    return (mode == AUDIO_MODE_IN_CALL)

            || (mode == AUDIO_MODE_IN_COMMUNICATION)

            || (mode == AUDIO_MODE_CALL_SCREEN);

            || (mode == AUDIO_MODE_CALL_SCREEN)

            || (mode == AUDIO_MODE_CALL_REDIRECT);

}



void AudioPolicyManager::cleanUpForDevice(const sp<DeviceDescriptor>& deviceDesc)

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+9 −1
Original line number Diff line number Diff line
@@ -219,7 +219,15 @@ Status AudioPolicyService::setPhoneState(AudioMode stateAidl, int32_t uidAidl) 
    // can be interleaved).

    Mutex::Autolock _l(mLock);

    // TODO: check if it is more appropriate to do it in platform specific policy manager

    AudioSystem::setMode(state);



    // Audio HAL mode conversion for call redirect modes

    audio_mode_t halMode = state;

    if (state == AUDIO_MODE_CALL_REDIRECT) {

        halMode = AUDIO_MODE_CALL_SCREEN;

    } else if (state == AUDIO_MODE_COMMUNICATION_REDIRECT) {

        halMode = AUDIO_MODE_NORMAL;

    }

    AudioSystem::setMode(halMode);



    AutoCallerClear acc;

    mAudioPolicyManager->setPhoneState(state);