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

Commit 764db963 authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix getParameters() default implementation. 

Do not return empty string but key value pairs with empty values.
parent 8652a49e

libs/audioflinger/AudioHardwareInterface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ status_t AudioHardwareBase::setParameters(const String8& keyValuePairs) 
// default implementation

String8 AudioHardwareBase::getParameters(const String8& keys)

{

    String8 result = String8("");

    return result;

    AudioParameter param = AudioParameter(keys);

    return param.toString();

}



// default implementation

libs/audioflinger/AudioHardwareStub.cpp

+12 −0
Original line number Diff line number Diff line
@@ -152,6 +152,12 @@ status_t AudioStreamOutStub::dump(int fd, const Vector<String16>& args) 
    return NO_ERROR;

}



String8 AudioStreamOutStub::getParameters(const String8& keys)

{

    AudioParameter param = AudioParameter(keys);

    return param.toString();

}



// ----------------------------------------------------------------------------



status_t AudioStreamInStub::set(int *pFormat, uint32_t *pChannels, uint32_t *pRate,
@@ -187,6 +193,12 @@ status_t AudioStreamInStub::dump(int fd, const Vector<String16>& args) 
    return NO_ERROR;

}



String8 AudioStreamInStub::getParameters(const String8& keys)

{

    AudioParameter param = AudioParameter(keys);

    return param.toString();

}



// ----------------------------------------------------------------------------



}; // namespace android

libs/audioflinger/AudioHardwareStub.h

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public: 
    virtual status_t    standby();

    virtual status_t    dump(int fd, const Vector<String16>& args);

    virtual status_t    setParameters(const String8& keyValuePairs) { return NO_ERROR;}

    virtual String8     getParameters(const String8& keys) {String8 result = String8(""); return result;}

    virtual String8     getParameters(const String8& keys);

};



class AudioStreamInStub : public AudioStreamIn {
@@ -55,7 +55,7 @@ public: 
    virtual status_t    dump(int fd, const Vector<String16>& args);

    virtual status_t    standby() { return NO_ERROR; }

    virtual status_t    setParameters(const String8& keyValuePairs) { return NO_ERROR;}

    virtual String8     getParameters(const String8& keys) {String8 result = String8(""); return result;}

    virtual String8     getParameters(const String8& keys);

};



class AudioHardwareStub : public  AudioHardwareBase