Block allocateBufferWithBackup in secure native handle mode
Bug: 63522818
Test: CtsMediaTestCases & YT & Play Movies & Cast
Change-Id: I2be2748ecabf49d7842a90676e68978bf0c56b71
(cherry picked from commit 528c7dd7c2387ac634b23973d0c1120d0f3d7ee7)
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp
index e7aaead..3575a25 100644
--- a/media/libstagefright/omx/OMXNodeInstance.cpp
+++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -1235,6 +1235,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;
@@ -1296,6 +1302,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;