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

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

Merge "Fix warnings for uninitialized local variables"

parents eddf9ef9 d0965dde

media/libmedia/AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -481,7 +481,7 @@ status_t AudioRecord::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) 
{

    AutoMutex lock(mLock);

    int active;

    status_t result;

    status_t result = NO_ERROR;

    audio_track_cblk_t* cblk = mCblk;

    uint32_t framesReq = audioBuffer->frameCount;

    uint32_t waitTimeMs = (waitCount < 0) ? cblk->bufferTimeoutMs : WAIT_PERIOD_MS;

media/libmedia/AudioTrack.cpp

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ sp<IMemory>& AudioTrack::sharedBuffer() 
void AudioTrack::start()

{

    sp<AudioTrackThread> t = mAudioTrackThread;

    status_t status;

    status_t status = NO_ERROR;



    LOGV("start %p", this);

    if (t != 0) {
@@ -825,7 +825,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount) 
{

    AutoMutex lock(mLock);

    int active;

    status_t result;

    status_t result = NO_ERROR;

    audio_track_cblk_t* cblk = mCblk;

    uint32_t framesReq = audioBuffer->frameCount;

    uint32_t waitTimeMs = (waitCount < 0) ? cblk->bufferTimeoutMs : WAIT_PERIOD_MS;