commit df11b20fd307efc547e9232f6e8aa1239c1fbf4f
author Dongwon Kang <dwkang@google.com> Mon Sep 11 16:34:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 11 16:34:59 2017 +0000
tree 71b4c1b9e5da1647bbe1c27beb1bf1c1beac6ba9
parent 528c7dd7c2387ac634b23973d0c1120d0f3d7ee7
parent cb8c0cbe5625c709103c1e97581c809e72f5b1da

Merge "Track graphic buffer mode in OMXNodeInstance" into nyc-dev

media/libstagefright/omx/OMXNodeInstance.cpp

diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index 1d22eee..f3f53bd 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1257,6 +1257,12 @@
         return BAD_VALUE;
     }
 
+    if (mSecureBufferType[portIndex] == kSecureBufferTypeUnknown) {
+        ALOGE("b/63522818");
+        android_errorWriteLog(0x534e4554, "63522818");
+        return ERROR_UNSUPPORTED;
+    }
+
     BufferMeta *buffer_meta = new BufferMeta(size, portIndex);
 
     OMX_BUFFERHEADERTYPE *header;
@@ -1318,6 +1324,12 @@
         return BAD_VALUE;
     }
 
+    if (mSecureBufferType[portIndex] != kSecureBufferTypeUnknown) {
+        ALOGE("b/63522818");
+        android_errorWriteLog(0x534e4554, "63522818");
+        return ERROR_UNSUPPORTED;
+    }
+
     // metadata buffers are not connected cross process; only copy if not meta
     bool copy = mMetadataType[portIndex] == kMetadataBufferTypeInvalid;