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

Commit 175f8338 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Simplify getParameters()"

parents 5be847c2 d8ea699d

services/audioflinger/Threads.cpp

+6 −12
Original line number Diff line number Diff line
@@ -1447,16 +1447,13 @@ void AudioFlinger::PlaybackThread::signal_l() 


String8 AudioFlinger::PlaybackThread::getParameters(const String8& keys)

{

    String8 out_s8 = String8("");

    char *s;



    Mutex::Autolock _l(mLock);

    if (initCheck() != NO_ERROR) {

        return out_s8;

        return String8();

    }



    s = mOutput->stream->common.get_parameters(&mOutput->stream->common, keys.string());

    out_s8 = String8(s);

    char *s = mOutput->stream->common.get_parameters(&mOutput->stream->common, keys.string());

    const String8 out_s8(s);

    free(s);

    return out_s8;

}
@@ -4874,16 +4871,13 @@ bool AudioFlinger::RecordThread::checkForNewParameters_l() 


String8 AudioFlinger::RecordThread::getParameters(const String8& keys)

{

    char *s;

    String8 out_s8 = String8();



    Mutex::Autolock _l(mLock);

    if (initCheck() != NO_ERROR) {

        return out_s8;

        return String8();

    }



    s = mInput->stream->common.get_parameters(&mInput->stream->common, keys.string());

    out_s8 = String8(s);

    char *s = mInput->stream->common.get_parameters(&mInput->stream->common, keys.string());

    const String8 out_s8(s);

    free(s);

    return out_s8;

}