commit 48d8020342a4de6b0b925328ddbdfe34f22253a3
author Wonsik Kim <wonsik@google.com> Mon Nov 21 16:55:25 2016 +0900
committer Wonsik Kim <wonsik@google.com> Mon Nov 21 16:56:37 2016 +0900
tree 6e20fd4787eb7d316b0b6e5d10063e45edb25483
parent 9ea205b1302f85bbf9364c1f41210c1837863f00

stagefright: do not set buffer when returning buffers

Bug: 32976893
Bug: 32542437
Test: (manual) play secure content on Play Movies app (fugu) and see that it doesn't crash
Change-Id: Ib45fd552634c9addc8ce25a1d255113c80cc8ce7

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index aaaac90..7761fb1 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2377,8 +2377,6 @@
         if (info->mNotify != NULL) {
             sp<AMessage> msg = info->mNotify;
             info->mNotify = NULL;
-            msg->setObject("buffer", (portIndex == kPortIndexInput && mCrypto != NULL)
-                    ? info->mSecureData : info->mData);
             if (isReclaim && info->mOwnedByClient) {
                 ALOGD("port %d buffer %zu still owned by client when codec is reclaimed",
                         portIndex, i);