Merge "APM: invert priority of sonification and enforced routing strategies" into oc-mr1-dev (469b1613) · Commits · e / os / android_frameworks_av

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -4721,10 +4721,10 @@ audio_devices_t AudioPolicyManager::getNewOutputDevice(const sp<AudioOutputDescr
		// use device for strategy enforced audible
		// 2: we are in call or the strategy phone is active on the output:
		// use device for strategy phone
		// 3: the strategy for enforced audible is active but not enforced on the output:
		// use the device for strategy enforced audible
		// 4: the strategy sonification is active on the output:
		// 3: the strategy sonification is active on the output:
		// use device for strategy sonification
		// 4: the strategy for enforced audible is active but not enforced on the output:
		// use the device for strategy enforced audible
		// 5: the strategy accessibility is active on the output:
		// use device for strategy accessibility
		// 6: the strategy "respectful" sonification is active on the output:
		@@ -4741,10 +4741,10 @@ audio_devices_t AudioPolicyManager::getNewOutputDevice(const sp<AudioOutputDescr
		} else if (isInCall() \|\|
		isStrategyActive(outputDesc, STRATEGY_PHONE)) {
		device = getDeviceForStrategy(STRATEGY_PHONE, fromCache);
		} else if (isStrategyActive(outputDesc, STRATEGY_ENFORCED_AUDIBLE)) {
		device = getDeviceForStrategy(STRATEGY_ENFORCED_AUDIBLE, fromCache);
		} else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION)) {
		device = getDeviceForStrategy(STRATEGY_SONIFICATION, fromCache);
		} else if (isStrategyActive(outputDesc, STRATEGY_ENFORCED_AUDIBLE)) {
		device = getDeviceForStrategy(STRATEGY_ENFORCED_AUDIBLE, fromCache);
		} else if (isStrategyActive(outputDesc, STRATEGY_ACCESSIBILITY)) {
		device = getDeviceForStrategy(STRATEGY_ACCESSIBILITY, fromCache);
		} else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION_RESPECTFUL)) {