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

Commit 672d9ca1 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: add support for device combo with speaker safe" into mnc-dev

parents db7733ad 9a7d9227

services/audiopolicy/common/include/Volume.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ public: 
            //  - HDMI-CEC system audio mode only output: give priority to available item in order.

            if (device & AUDIO_DEVICE_OUT_SPEAKER) {

                device = AUDIO_DEVICE_OUT_SPEAKER;

            } else if (device & AUDIO_DEVICE_OUT_SPEAKER_SAFE) {

                device = AUDIO_DEVICE_OUT_SPEAKER_SAFE;

            } else if (device & AUDIO_DEVICE_OUT_HDMI_ARC) {

                device = AUDIO_DEVICE_OUT_HDMI_ARC;

            } else if (device & AUDIO_DEVICE_OUT_AUX_LINE) {

services/audiopolicy/enginedefault/src/Engine.cpp

+10 −4
Original line number Diff line number Diff line
@@ -319,8 +319,11 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const 
            device = getDeviceForStrategy(STRATEGY_SONIFICATION);

            //user "safe" speaker if available instead of normal speaker to avoid triggering

            //other acoustic safety mechanisms for notification

            if (device == AUDIO_DEVICE_OUT_SPEAKER && (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE))

                device = AUDIO_DEVICE_OUT_SPEAKER_SAFE;

            if ((device & AUDIO_DEVICE_OUT_SPEAKER) &&

                    (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {

                device |= AUDIO_DEVICE_OUT_SPEAKER_SAFE;

                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

            device = getDeviceForStrategy(STRATEGY_MEDIA);
@@ -329,8 +332,11 @@ audio_devices_t Engine::getDeviceForStrategy(routing_strategy strategy) const 
            device = getDeviceForStrategy(STRATEGY_SONIFICATION);

            //user "safe" speaker if available instead of normal speaker to avoid triggering

            //other acoustic safety mechanisms for notification

            if (device == AUDIO_DEVICE_OUT_SPEAKER && (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE))

                device = AUDIO_DEVICE_OUT_SPEAKER_SAFE;

            if ((device & AUDIO_DEVICE_OUT_SPEAKER) &&

                    (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {

                device |= AUDIO_DEVICE_OUT_SPEAKER_SAFE;

                device &= ~AUDIO_DEVICE_OUT_SPEAKER;

            }

        }

        break;