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

Commit 208cfff3 authored by Lorena Torres-Huerta's avatar Lorena Torres-Huerta Committed by Eric Laurent
Browse files

Remove default device selection logic that gives top priority to connected hearing aids. 

Bug: 239888691
Bug: 229358080
Test: m
Change-Id: Icaad511b02cd327d6fedd2933ce026924036410b
Merged-In: Icaad511b02cd327d6fedd2933ce026924036410b
(cherry picked from commit 07fd48af)
parent 925abedb

services/audiopolicy/enginedefault/src/Engine.cpp

+8 −3
Original line number Diff line number Diff line
@@ -273,10 +273,15 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
        break;



    case STRATEGY_PHONE: {

        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_HEARING_AID);

        if (!devices.isEmpty()) break;

        // TODO(b/243670205): remove this logic that gives preference to last removable devices

        // once a UX decision has been made

        devices = availableOutputDevices.getFirstDevicesFromTypes(

                        getLastRemovableMediaDevices(GROUP_NONE, {AUDIO_DEVICE_OUT_BLE_HEADSET}));

                        getLastRemovableMediaDevices(GROUP_NONE, {

                            // excluding HEARING_AID and BLE_HEADSET because Dialer uses

                            // setCommunicationDevice to select them explicitly

                            AUDIO_DEVICE_OUT_HEARING_AID,

                            AUDIO_DEVICE_OUT_BLE_HEADSET

                            }));

        if (!devices.isEmpty()) break;

        devices = availableOutputDevices.getFirstDevicesFromTypes({

                AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_EARPIECE});