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

Commit f10c4598 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "Favor dock over speaker combination for SONIFICATION" into tm-qpr-dev... 

Merge "Favor dock over speaker combination for SONIFICATION" into tm-qpr-dev am: ff8e6031 am: 13ed8e37

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



Change-Id: I7c28c07f60b563387f3e2aa79a6b24f66003dbfa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1bd40609 13ed8e37

services/audiopolicy/enginedefault/src/Engine.cpp

+3 −1
Original line number Diff line number Diff line
@@ -299,7 +299,9 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 


        if ((strategy == STRATEGY_SONIFICATION) ||

                (getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED)) {

            devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_SPEAKER);

            // favor dock over speaker when available

            devices = availableOutputDevices.getFirstDevicesFromTypes({

                    AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_SPEAKER});

        }



        // if SCO headset is connected and we are told to use it, play ringtone over