summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-04-23 14:34:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-23 14:34:55 -0700
commitadb6e8dc714f38e261b1593efa4eb17bac5e1678 (patch)
treeb6053f7390d2e678035707a34e5c3f63decd8bc9
parent36513e357dfc6c53898d4b4f768c9fd4822f4653 (diff)
parentca8b28013c0558a4a3323a1a0f58520277200086 (diff)
downloadframeworks_av-adb6e8dc714f38e261b1593efa4eb17bac5e1678.zip
frameworks_av-adb6e8dc714f38e261b1593efa4eb17bac5e1678.tar.gz
frameworks_av-adb6e8dc714f38e261b1593efa4eb17bac5e1678.tar.bz2
Merge "Fix regression in AudioTrack::pause()"
-rw-r--r--media/libmedia/AudioTrack.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 9d338f3..5d5a312 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -1402,7 +1402,10 @@ bool AudioTrack::AudioTrackThread::threadLoop()
return true;
}
}
- return mReceiver.processAudioBuffer(this);
+ if (!mReceiver.processAudioBuffer(this)) {
+ pause();
+ }
+ return true;
}
status_t AudioTrack::AudioTrackThread::readyToRun()