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

Commit 8bd7f322 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "policy_hal: revert primary desc check for sonification" into audio-userspace.lnx.2.2-dev

parents d907196c 20e9ad5d

policy_hal/AudioPolicyManager.cpp

+2 −5
Original line number Diff line number Diff line
@@ -682,12 +682,9 @@ audio_devices_t AudioPolicyManagerCustom::getNewOutputDevice(const sp<AudioOutpu 
        device = getDeviceForStrategy(STRATEGY_PHONE, fromCache);

    } else if (isStrategyActive(outputDesc, STRATEGY_ENFORCED_AUDIBLE)) {

        device = getDeviceForStrategy(STRATEGY_ENFORCED_AUDIBLE, fromCache);

    } else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION)||

                (isStrategyActive(mPrimaryOutput,STRATEGY_SONIFICATION)

                && (!isStrategyActive(mPrimaryOutput,STRATEGY_MEDIA)))) {

    } else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION)) {

        device = getDeviceForStrategy(STRATEGY_SONIFICATION, fromCache);

    } else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION_RESPECTFUL) ||

                isStrategyActive(mPrimaryOutput,STRATEGY_SONIFICATION_RESPECTFUL)) {

    } else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION_RESPECTFUL)) {

        device = getDeviceForStrategy(STRATEGY_SONIFICATION_RESPECTFUL, fromCache);

    } else if (isStrategyActive(outputDesc, STRATEGY_ACCESSIBILITY)) {

        device = getDeviceForStrategy(STRATEGY_ACCESSIBILITY, fromCache);