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

Commit 20e9ad5d authored by Garmond Leung's avatar Garmond Leung
Browse files

policy_hal: revert primary desc check for sonification 

This change is no longer applicable since headset
and speaker are on independent backends, reverting to
line-up with base APM.

CRs-Fixed: 1116109

Change-Id: I715f4e8599e5f03e0aee63c7057ea717d788dde4
parent 01d462b1

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);