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

Commit 34c594bd authored by Eric Laurent's avatar Eric Laurent Committed by The Android Open Source Project
Browse files

AI 143775: am: CL 143620 Attempt for fixing crash in... 

AI 143775: am: CL 143620 Attempt for fixing crash in AudioFlinger::MixerThread::dumpTracks() seen in bug report for issue 1747119.
  AudioFlinger::MixerThread::dumpTracks() was reading mTracks[] vector instead of mActiveTracks[] when dumping active tracks.
  Original author: elaurent
  Merged from: //branches/cupcake/...

Automated import of CL 143775
parent cbcb00eb

libs/audioflinger/AudioFlinger.cpp

+5 −8
Original line number Diff line number Diff line
@@ -941,21 +941,18 @@ status_t AudioFlinger::MixerThread::dumpTracks(int fd, const Vector<String16>& a 
    result.append(buffer);

    result.append("   Name Clien Typ Fmt Chn Buf S M F SRate LeftV RighV Serv User\n");

    for (size_t i = 0; i < mTracks.size(); ++i) {

        wp<Track> wTrack = mTracks[i];

        if (wTrack != 0) {

            sp<Track> track = wTrack.promote();

        sp<Track> track = mTracks[i];

        if (track != 0) {

            track->dump(buffer, SIZE);

            result.append(buffer);

        }

    }

    }



    snprintf(buffer, SIZE, "Output %d mixer thread active tracks\n", mOutputType);

    result.append(buffer);

    result.append("   Name Clien Typ Fmt Chn Buf S M F SRate LeftV RighV Serv User\n");

    for (size_t i = 0; i < mActiveTracks.size(); ++i) {

        wp<Track> wTrack = mTracks[i];

        wp<Track> wTrack = mActiveTracks[i];

        if (wTrack != 0) {

            sp<Track> track = wTrack.promote();

            if (track != 0) {