summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorEric Laurent <>2009-03-31 14:33:34 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-31 14:33:34 -0700
commit34c594bde98a3fa8491b22deaed0493f5183c738 (patch)
tree323ceeb7aa45e73045eb49f781b1b02e4bd58710 /libs
parentcbcb00eb7302a166411c0b87e6a9ed70298f65b2 (diff)
downloadframeworks_native-34c594bde98a3fa8491b22deaed0493f5183c738.zip
frameworks_native-34c594bde98a3fa8491b22deaed0493f5183c738.tar.gz
frameworks_native-34c594bde98a3fa8491b22deaed0493f5183c738.tar.bz2
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
Diffstat (limited to 'libs')
-rw-r--r--libs/audioflinger/AudioFlinger.cpp13
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) {