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

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

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

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

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



Change-Id: I66ea1fb45e21968b705ba80c04c3194506db0781
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d729d160 ead7feef

services/audiopolicy/enginedefault/src/Engine.cpp

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



    case STRATEGY_PHONE: {

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

        // once a UX decision has been made

        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_HEARING_AID);

        if (!devices.isEmpty()) break;

        devices = availableOutputDevices.getFirstDevicesFromTypes(

                        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

                            }));

                        getLastRemovableMediaDevices(GROUP_NONE, {AUDIO_DEVICE_OUT_BLE_HEADSET}));

        if (!devices.isEmpty()) break;

        devices = availableOutputDevices.getFirstDevicesFromTypes({

                AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, AUDIO_DEVICE_OUT_EARPIECE});