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

Commit 11c992e9 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "audio policy: add back use of A2DP for phone strategy" into sc-dev am: 1f08556b 

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

Change-Id: I971114a0040a515624bfafaa0fc367b8d4082c31
parents f7234dc4 1f08556b

services/audiopolicy/enginedefault/src/Engine.cpp

+2 −6
Original line number Diff line number Diff line
@@ -261,12 +261,8 @@ DeviceVector Engine::getDevicesForStrategyInt(legacy_strategy strategy, 
    case STRATEGY_PHONE: {

        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_HEARING_AID);

        if (!devices.isEmpty()) break;

        devices = availableOutputDevices.getFirstDevicesFromTypes({

                                                                  AUDIO_DEVICE_OUT_WIRED_HEADPHONE,

                                                                  AUDIO_DEVICE_OUT_WIRED_HEADSET,

                                                                  AUDIO_DEVICE_OUT_LINE,

                                                                  AUDIO_DEVICE_OUT_USB_HEADSET,

                                                                  AUDIO_DEVICE_OUT_USB_DEVICE});

        devices = availableOutputDevices.getFirstDevicesFromTypes(

                                          getLastRemovableMediaDevices());

        if (!devices.isEmpty()) break;

        devices = availableOutputDevices.getDevicesFromType(AUDIO_DEVICE_OUT_EARPIECE);

    } break;