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

Commit afe53b6b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "Add back AUDIO_DEVICE_*_STUB to the enum map."

parents c0fff7e6 0aa15c6e

media/libmedia/TypeConverter.cpp

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

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_OUT_BUS),

    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),

    TERMINATOR

};
@@ -86,6 +88,8 @@ const InputDeviceConverter::Table InputDeviceConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_IP),

    MAKE_STRING_FROM_ENUM(AUDIO_DEVICE_IN_BUS),

    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),

    TERMINATOR

};

services/audiopolicy/common/include/policy.h

+0 −10
Original line number Diff line number Diff line
@@ -46,16 +46,6 @@ static const audio_format_t gDynamicFormat = AUDIO_FORMAT_DEFAULT; 


#define APM_AUDIO_DEVICE_IN_MATCH_ADDRESS_ALL (AUDIO_DEVICE_IN_REMOTE_SUBMIX|AUDIO_DEVICE_IN_BUS)



/**

 * Stub audio output device. Used in policy configuration file on platforms without audio outputs.

 * This alias value to AUDIO_DEVICE_OUT_DEFAULT is only used in the audio policy context.

 */

#define AUDIO_DEVICE_OUT_STUB AUDIO_DEVICE_OUT_DEFAULT

/**

 * Stub audio input device. Used in policy configuration file on platforms without audio inputs.

 * This alias value to AUDIO_DEVICE_IN_DEFAULT is only used in the audio policy context.

 */

#define AUDIO_DEVICE_IN_STUB AUDIO_DEVICE_IN_DEFAULT

/**

 * Alias to AUDIO_DEVICE_OUT_DEFAULT defined for clarification when this value is used by volume

 * control APIs (e.g setStreamVolumeIndex().