summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorDave Sparks <davidsparks@android.com>2010-03-02 12:56:37 -0800
committerDave Sparks <davidsparks@android.com>2010-03-02 12:56:37 -0800
commit6c26fe4e8e224c4360a4291742cd4f7f12f69e82 (patch)
tree4e1af1326fa6d525959a66053ca241b2cea9864a /media/libmediaplayerservice
parent16433e2fe309f759fec3266db56232f55114beb2 (diff)
downloadframeworks_base-6c26fe4e8e224c4360a4291742cd4f7f12f69e82.zip
frameworks_base-6c26fe4e8e224c4360a4291742cd4f7f12f69e82.tar.gz
frameworks_base-6c26fe4e8e224c4360a4291742cd4f7f12f69e82.tar.bz2
Fix build. I screwed up a merge.
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/MediaPlayerService.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 6332f70..594e010 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1805,7 +1805,7 @@ void MediaPlayerService::AudioCache::notify(void* cookie, int msg, int ext1, int
}
// wake up thread
- Mutex::Autolock lock(mLock);
+ Mutex::Autolock lock(p->mLock);
p->mCommandComplete = true;
p->mSignal.signal();
}