commit 4647032d5d580e890f2e6c5508aaa6386624df7f
author Dongwon Kang <dwkang@google.com> Tue Aug 15 11:47:21 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 06 18:27:39 2017 +0000
tree 2bca0ff883d21ce7eaa71ed27be9718fcb73cba5
parent 442e7cb33a980fa87764094cd3a9ed166a06bc18

Block allocateBufferWithBackup in secure native handle mode

Bug: 63522818
Test: CtsMediaTestCases & YT & Play Movies & Cast
Change-Id: I2be2748ecabf49d7842a90676e68978bf0c56b71
(cherry picked from commit 528c7dd7c2387ac634b23973d0c1120d0f3d7ee7)

media/libstagefright/omx/OMXNodeInstance.cpp

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;