summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrack.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-03-10 11:21:43 -0700
committerMarco Nelissen <marcone@google.com>2014-03-10 11:21:43 -0700
commit3a90f2849d49bf65f2d6257fd6da30ae46d745fa (patch)
tree992a54b006e96de6f62b2b0420bf352935b775c9 /media/libmedia/AudioTrack.cpp
parent664334fc2204b9968e1600313383f5a6ff321811 (diff)
downloadframeworks_av-3a90f2849d49bf65f2d6257fd6da30ae46d745fa.zip
frameworks_av-3a90f2849d49bf65f2d6257fd6da30ae46d745fa.tar.gz
frameworks_av-3a90f2849d49bf65f2d6257fd6da30ae46d745fa.tar.bz2
Fix freeze on pause
isOffloaded() tries to lock mLock again. We should be calling isOffloaded_l() b/13394633 Change-Id: I155be6fee937f894d8e6c974e593223ab6014ade
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
-rw-r--r--media/libmedia/AudioTrack.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 3217171..ae47201 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -555,7 +555,7 @@ void AudioTrack::pause()
mProxy->interrupt();
mAudioTrack->pause();
- if (isOffloaded()) {
+ if (isOffloaded_l()) {
if (mOutput != 0) {
uint32_t halFrames;
// OffloadThread sends HAL pause in its threadLoop.. time saved