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

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

Merge "audio: add device definitions for BLE Audio" am: 3ce5f38a 

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

Change-Id: I7bd59a159c20365defff62ce0d1570327cf82943
parents a19f43a1 3ce5f38a

media/libmediahelper/TypeConverter.cpp

+3 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ const OutputDeviceConverter::Table OutputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_USB_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_HEARING_AID),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_ECHO_CANCELLER),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLE_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BLE_SPEAKER),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_DEFAULT),

    // STUB must be after DEFAULT, so the latter is picked up by toString first.

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_STUB),
@@ -96,6 +98,7 @@ const InputDeviceConverter::Table InputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_USB_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLUETOOTH_BLE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_ECHO_REFERENCE),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BLE_HEADSET),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_DEFAULT),

    // STUB must be after DEFAULT, so the latter is picked up by toString first.

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_STUB),

services/audiopolicy/common/include/Volume.h

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ public: 
        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP:

        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES:

        case AUDIO_DEVICE_OUT_USB_HEADSET:

        case AUDIO_DEVICE_OUT_BLE_HEADSET:

            return DEVICE_CATEGORY_HEADSET;

        case AUDIO_DEVICE_OUT_HEARING_AID:

            return DEVICE_CATEGORY_HEARING_AID;
@@ -139,6 +140,7 @@ public: 
        case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER:

        case AUDIO_DEVICE_OUT_USB_ACCESSORY:

        case AUDIO_DEVICE_OUT_REMOTE_SUBMIX:

        case AUDIO_DEVICE_OUT_BLE_SPEAKER:

        default:

            return DEVICE_CATEGORY_SPEAKER;

        }

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5840,7 +5840,8 @@ float AudioPolicyManager::computeVolume(IVolumeCurves &curves, 
    if (!Intersection(deviceTypes,

            {AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES,

             AUDIO_DEVICE_OUT_WIRED_HEADSET, AUDIO_DEVICE_OUT_WIRED_HEADPHONE,

             AUDIO_DEVICE_OUT_USB_HEADSET, AUDIO_DEVICE_OUT_HEARING_AID}).empty() &&

             AUDIO_DEVICE_OUT_USB_HEADSET, AUDIO_DEVICE_OUT_HEARING_AID,

             AUDIO_DEVICE_OUT_BLE_HEADSET}).empty() &&

            ((volumeSource == alarmVolumeSrc ||

              volumeSource == ringVolumeSrc) ||

             (volumeSource == toVolumeSource(AUDIO_STREAM_NOTIFICATION)) ||