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

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

Merge "Fix the name of the constant for device [dis]connect parameter"

parents 41048c03 f23fcf68

media/libaudioclient/include/media/AudioParameter.h

+3 −3
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ public: 
    //  keyAudioLanguagePreferred: Preferred audio language

    static const char * const keyAudioLanguagePreferred;



    //  keyStreamConnect / Disconnect: value is an int in audio_devices_t

    static const char * const keyStreamConnect;

    static const char * const keyStreamDisconnect;

    //  keyDeviceConnect / Disconnect: value is an int in audio_devices_t

    static const char * const keyDeviceConnect;

    static const char * const keyDeviceDisconnect;



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

    //   keyStreamSupportedFormats: audio_format_t

media/libmedia/AudioParameter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ const char * const AudioParameter::keyAudioLanguagePreferred = 
        AUDIO_PARAMETER_KEY_AUDIO_LANGUAGE_PREFERRED;

const char * const AudioParameter::keyMonoOutput = AUDIO_PARAMETER_MONO_OUTPUT;

const char * const AudioParameter::keyStreamHwAvSync = AUDIO_PARAMETER_STREAM_HW_AV_SYNC;

const char * const AudioParameter::keyStreamConnect = AUDIO_PARAMETER_DEVICE_CONNECT;

const char * const AudioParameter::keyStreamDisconnect = AUDIO_PARAMETER_DEVICE_DISCONNECT;

const char * const AudioParameter::keyDeviceConnect = AUDIO_PARAMETER_DEVICE_CONNECT;

const char * const AudioParameter::keyDeviceDisconnect = 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 =

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1357,8 +1357,8 @@ void AudioFlinger::filterReservedParameters(String8& keyValuePairs, uid_t callin 
        String8(AudioParameter::keyFrameCount),

        String8(AudioParameter::keyInputSource),

        String8(AudioParameter::keyMonoOutput),

        String8(AudioParameter::keyStreamConnect),

        String8(AudioParameter::keyStreamDisconnect),

        String8(AudioParameter::keyDeviceConnect),

        String8(AudioParameter::keyDeviceDisconnect),

        String8(AudioParameter::keyStreamSupportedFormats),

        String8(AudioParameter::keyStreamSupportedChannels),

        String8(AudioParameter::keyStreamSupportedSamplingRates),

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void AudioPolicyManager::broadcastDeviceConnectionState(const sp<DeviceDescripto 
{

    AudioParameter param(device->address());

    const String8 key(state == AUDIO_POLICY_DEVICE_STATE_AVAILABLE ?

                AudioParameter::keyStreamConnect : AudioParameter::keyStreamDisconnect);

                AudioParameter::keyDeviceConnect : AudioParameter::keyDeviceDisconnect);

    param.addInt(key, device->type());

    mpClientInterface->setParameters(AUDIO_IO_HANDLE_NONE, param.toString());

}