commit 55a701e923ca9c33f2121ab6596b070a0df023ff
author Marco Nelissen <marcone@google.com> Wed Sep 25 14:16:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 25 14:16:15 2013 -0700
tree d397413d2aa3b66d8123afa4a712f74ff46d0df8
parent 7b388f9035d898840ab54f4942563dcfeccdcfa5
parent 3fa1d013a297605db9c8e2a4ef71f5bf9c888a24

am 3fa1d013: am d7b5f3da: Merge "Fix hang" into klp-dev

* commit '3fa1d013a297605db9c8e2a4ef71f5bf9c888a24':
  Fix hang

media/jni/android_media_MediaCodec.cpp

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 @@
         int flags) {
     sp<Surface> client;
     if (bufferProducer != NULL) {
-        mSurfaceTextureClient = new Surface(bufferProducer);
+        mSurfaceTextureClient = new Surface(bufferProducer, true /* controlledByApp */);
     } else {
         mSurfaceTextureClient.clear();
     }