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

Commit 2b691b90 authored by Zbigniew Mazur's avatar Zbigniew Mazur Committed by Johan Redestig
Browse files

AudioTrack::dump null mCblk check test 

This fix is protecting AudioTrack::dump from SIGSEGEV
when calling dumpsys shell command.

Change-Id: I30d136e195a12d6fdad41e14f557b0ad9e59b8a2
parent 33cf49b1

media/libmedia/AudioTrack.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -1441,7 +1441,7 @@ status_t AudioTrack::dump(int fd, const Vector<String16>& args) const 
    result.append(" AudioTrack::dump\n");

    result.append(" AudioTrack::dump\n");

    snprintf(buffer, 255, "  stream type(%d), left - right volume(%f, %f)\n", mStreamType, mVolume[0], mVolume[1]);

    snprintf(buffer, 255, "  stream type(%d), left - right volume(%f, %f)\n", mStreamType, mVolume[0], mVolume[1]);

    result.append(buffer);

    result.append(buffer);

    snprintf(buffer, 255, "  format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, mCblk->frameCount);

    snprintf(buffer, 255, "  format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, (mCblk == 0) ? 0 : mCblk->frameCount);

    result.append(buffer);

    result.append(buffer);

    snprintf(buffer, 255, "  sample rate(%d), status(%d), muted(%d)\n", (mCblk == 0) ? 0 : mCblk->sampleRate, mStatus, mMuted);

    snprintf(buffer, 255, "  sample rate(%d), status(%d), muted(%d)\n", (mCblk == 0) ? 0 : mCblk->sampleRate, mStatus, mMuted);

    result.append(buffer);

    result.append(buffer);