diff options
| author | Eric Laurent <> | 2009-03-31 14:34:35 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-31 14:34:35 -0700 |
| commit | d3b4d0cfc10c95c9190a2b0e6a8c8e8f3d448b87 (patch) | |
| tree | 3dfed7edeb6f4db6610996089546c0fdf30cc483 /libs | |
| parent | bed911a44a3df311c3af7d8cb821544609bced9a (diff) | |
| download | frameworks_base-d3b4d0cfc10c95c9190a2b0e6a8c8e8f3d448b87.zip frameworks_base-d3b4d0cfc10c95c9190a2b0e6a8c8e8f3d448b87.tar.gz frameworks_base-d3b4d0cfc10c95c9190a2b0e6a8c8e8f3d448b87.tar.bz2 | |
AI 143785: am: CL 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/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143785
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/audioflinger/AudioFlinger.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libs/audioflinger/AudioFlinger.cpp b/libs/audioflinger/AudioFlinger.cpp index b9ecdd8..d11e13a 100644 --- a/libs/audioflinger/AudioFlinger.cpp +++ b/libs/audioflinger/AudioFlinger.cpp @@ -941,13 +941,10 @@ 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(); - if (track != 0) { - track->dump(buffer, SIZE); - result.append(buffer); - } + sp<Track> track = mTracks[i]; + if (track != 0) { + track->dump(buffer, SIZE); + result.append(buffer); } } @@ -955,7 +952,7 @@ 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 < mActiveTracks.size(); ++i) { - wp<Track> wTrack = mTracks[i]; + wp<Track> wTrack = mActiveTracks[i]; if (wTrack != 0) { sp<Track> track = wTrack.promote(); if (track != 0) { |