diff options
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 673a5ee..d8ec61b 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -2005,9 +2005,6 @@ audio_devices_t AudioPolicyManagerBase::getNewDevice(audio_io_handle_t output, b audio_devices_t device = AUDIO_DEVICE_NONE; AudioOutputDescriptor *outputDesc = mOutputs.valueFor(output); -#ifdef QCOM_HARDWARE - AudioOutputDescriptor *primaryOutputDesc = mOutputs.valueFor(mPrimaryOutput); -#endif // check the following by order of priority to request a routing change if necessary: // 1: the strategy enforced audible is active on the output: // use device for strategy enforced audible @@ -2026,13 +2023,7 @@ audio_devices_t AudioPolicyManagerBase::getNewDevice(audio_io_handle_t output, b } else if (isInCall() || outputDesc->isUsedByStrategy(STRATEGY_PHONE)) { device = getDeviceForStrategy(STRATEGY_PHONE, fromCache); -#ifdef QCOM_HARDWARE - } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION) || - (primaryOutputDesc->isUsedByStrategy(STRATEGY_SONIFICATION))) -#else - } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION)) -#endif - { + } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION)){ device = getDeviceForStrategy(STRATEGY_SONIFICATION, fromCache); } else if (outputDesc->isUsedByStrategy(STRATEGY_SONIFICATION_RESPECTFUL)) { device = getDeviceForStrategy(STRATEGY_SONIFICATION_RESPECTFUL, fromCache); |