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

Commit 06b5199b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9485425 from 208cfff3 to tm-qpr3-release 

Change-Id: I8defbd3e14c77e299521c9ebc92e24cd720ac4f1
parents ee623242 208cfff3

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