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

Commit f64d1add authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "Audio routing: Fix notification routing during A11y playback" into oc-dr1-dev 

am: 53f4c18b

Change-Id: I2bead291c19e5d2a475c6a8cc131b29467605d3f
parents 76689409 53f4c18b

services/audiopolicy/enginedefault/src/Engine.cpp

+5 −2
Original line number Diff line number Diff line
@@ -277,8 +277,11 @@ audio_devices_t Engine::getDeviceForStrategyInt(routing_strategy strategy, 
                device &= ~AUDIO_DEVICE_OUT_SPEAKER;

            }

        } else if (outputs.isStreamActive(

                                AUDIO_STREAM_MUSIC, SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY)) {

            // while media is playing (or has recently played), use the same device

                                AUDIO_STREAM_MUSIC, SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY)

                    || outputs.isStreamActive(

                            AUDIO_STREAM_ACCESSIBILITY, SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY))

        {

            // while media/a11y is playing (or has recently played), use the same device

            device = getDeviceForStrategyInt(

                    STRATEGY_MEDIA, availableOutputDevices, availableInputDevices, outputs);

        } else {