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

Commit 2629ab5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Restore stream [dis]connect parameters in deprecated state"

parents a23410a0 2207c056

media/libaudioclient/include/media/AudioParameter.h

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ public: 
    //  keyDeviceConnect / Disconnect: value is an int in audio_devices_t

    static const char * const keyDeviceConnect;

    static const char * const keyDeviceDisconnect;

    //  Need to be here because vendors still use them.

    static const char * const keyStreamConnect;  // Deprecated: DO NOT USE.

    static const char * const keyStreamDisconnect;  // Deprecated: DO NOT USE.



    // For querying stream capabilities. All the returned values are lists.

    //   keyStreamSupportedFormats: audio_format_t

media/libmedia/AudioParameter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ const char * const AudioParameter::keyMonoOutput = AUDIO_PARAMETER_MONO_OUTPUT; 
const char * const AudioParameter::keyStreamHwAvSync = AUDIO_PARAMETER_STREAM_HW_AV_SYNC;

const char * const AudioParameter::keyDeviceConnect = AUDIO_PARAMETER_DEVICE_CONNECT;

const char * const AudioParameter::keyDeviceDisconnect = AUDIO_PARAMETER_DEVICE_DISCONNECT;

const char * const AudioParameter::keyStreamConnect = AUDIO_PARAMETER_DEVICE_CONNECT;

const char * const AudioParameter::keyStreamDisconnect = AUDIO_PARAMETER_DEVICE_DISCONNECT;

const char * const AudioParameter::keyStreamSupportedFormats = AUDIO_PARAMETER_STREAM_SUP_FORMATS;

const char * const AudioParameter::keyStreamSupportedChannels = AUDIO_PARAMETER_STREAM_SUP_CHANNELS;

const char * const AudioParameter::keyStreamSupportedSamplingRates =