summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-09-16 16:04:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-16 16:04:21 -0700
commitb5c682905d2735785bab6d7a27c131afbfe7650b (patch)
tree81da87041939d507b4ba0015cf033d7c8c9ed6bc /media/libmediaplayerservice
parent9dbf87543b3a08fe39ba160494207f074294134c (diff)
parent83774965fefc5d0315ec41641bdd99cf0a657462 (diff)
downloadframeworks_av-b5c682905d2735785bab6d7a27c131afbfe7650b.zip
frameworks_av-b5c682905d2735785bab6d7a27c131afbfe7650b.tar.gz
frameworks_av-b5c682905d2735785bab6d7a27c131afbfe7650b.tar.bz2
am 83774965: am bc910e5c: Merge "Fix hang" into klp-dev
* commit '83774965fefc5d0315ec41641bdd99cf0a657462': Fix hang
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 8833bd7..0dabd37 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -744,7 +744,7 @@ status_t MediaPlayerService::Client::setVideoSurfaceTexture(
sp<ANativeWindow> anw;
if (bufferProducer != NULL) {
- anw = new Surface(bufferProducer);
+ anw = new Surface(bufferProducer, true /* controlledByApp */);
status_t err = native_window_api_connect(anw.get(),
NATIVE_WINDOW_API_MEDIA);