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

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

Revert "Revert "Remove default device selection logic that gives top priority... 

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

This reverts commit ead7feef.

Reason for revert: b/229358080

Change-Id: Ibebdaa7058895d5913dfb3c874d036aecdef8964
parent ead7feef

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});