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

Commit 2fc21255 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audio policy: fix speakerphone mode for digital dock" into tm-qpr-dev... 

Merge "audio policy: fix speakerphone mode for digital dock" into tm-qpr-dev am: ade1a777 am: 563800fa

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



Change-Id: I25c536bf80f8689bef6de8648d150b7337f1a820
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 35dd2722 563800fa

services/audiopolicy/enginedefault/src/Engine.cpp

+6 −0
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ void Engine::filterOutputDevicesForStrategy(legacy_strategy strategy, 
                    AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,

                    AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER, }));

        }

        // If connected to a dock, never use the device speaker for calls

        if (!availableOutputDevices.getDevicesFromTypes({AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET})

                .isEmpty()) {

            availableOutputDevices.remove(

                    availableOutputDevices.getDevicesFromTypes({AUDIO_DEVICE_OUT_SPEAKER}));

        }

        } break;

    case STRATEGY_ACCESSIBILITY: {

        // do not route accessibility prompts to a digital output currently configured with a