summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2013-09-25 13:45:41 -0700
committerMarco Nelissen <marcone@google.com>2013-09-25 13:45:41 -0700
commitfd2e50086c4f4e2bb064c76a1de73e10c172f387 (patch)
treee4e23736959b73c030f01bbf8aff4008f08a4833 /media
parent1b87107bb37be580888f1617d047ca9009c18a7f (diff)
downloadframeworks_base-fd2e50086c4f4e2bb064c76a1de73e10c172f387.zip
frameworks_base-fd2e50086c4f4e2bb064c76a1de73e10c172f387.tar.gz
frameworks_base-fd2e50086c4f4e2bb064c76a1de73e10c172f387.tar.bz2
Fix hang
b/10855561 Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
Diffstat (limited to 'media')
-rw-r--r--media/jni/android_media_MediaCodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index a859506..b8d437c 100644
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -122,7 +122,7 @@ status_t JMediaCodec::configure(
int flags) {
sp<Surface> client;
if (bufferProducer != NULL) {
- mSurfaceTextureClient = new Surface(bufferProducer);
+ mSurfaceTextureClient = new Surface(bufferProducer, true /* controlledByApp */);
} else {
mSurfaceTextureClient.clear();
}