summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-09-16 22:57:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-16 22:57:18 +0000
commitbc910e5c8d05f24531bd6b11379cf41cc73415ed (patch)
tree48a82de7153143fd418c155207166e6e62eaa7c1 /media/libmediaplayerservice
parenta099d1f6be3fbbb1af4c12b2ab627397f0826982 (diff)
parentee08f7e36eeba80e005f9bdaebce635860a8f005 (diff)
downloadframeworks_av-bc910e5c8d05f24531bd6b11379cf41cc73415ed.zip
frameworks_av-bc910e5c8d05f24531bd6b11379cf41cc73415ed.tar.gz
frameworks_av-bc910e5c8d05f24531bd6b11379cf41cc73415ed.tar.bz2
Merge "Fix hang" into klp-dev
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);