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

Commit cb97ccd6 authored by Carter Hsu's avatar Carter Hsu Committed by Automerger Merge Worker
Browse files

Merge "audio: prefer STRATEGY_SONIFICATION when ringotne is active" into sc-dev am: 429eade1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15127094

Change-Id: I98256f5eaf2ad1d174c2f801cbd1a3c4e08f8790
parents d08d471e 429eade1
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -5847,11 +5847,12 @@ DeviceVector AudioPolicyManager::getNewOutputDevices(const sp<SwAudioOutputDescr
        // With low-latency playing on speaker, music on WFD, when the first low-latency
        // output is stopped, getNewOutputDevices checks for a product strategy
        // from the list, as STRATEGY_SONIFICATION comes prior to STRATEGY_MEDIA.
        // If an ALARM or ENFORCED_AUDIBLE stream is supported by the product strategy,
        // If an ALARM, RING or ENFORCED_AUDIBLE stream is supported by the product strategy,
        // devices are returned for STRATEGY_SONIFICATION without checking whether the
        // stream is associated to the output descriptor.
        if (doGetOutputDevicesForVoice() || outputDesc->isStrategyActive(productStrategy) ||
               ((hasStreamActive(AUDIO_STREAM_ALARM) ||
                hasStreamActive(AUDIO_STREAM_RING) ||
                hasStreamActive(AUDIO_STREAM_ENFORCED_AUDIBLE)) &&
                mOutputs.isStrategyActiveOnSameModule(productStrategy, outputDesc))) {
            // Retrieval of devices for voice DL is done on primary output profile, cannot