commit 8d1e0c5b73c03d6d2e1d00c1ad3126b9b92d6cd6
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Jan 27 00:29:28 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Jan 27 00:29:28 2019 +0000
tree a610ebd8c2f2b0907b965580bf1012b21cb9a2c1
parent 0ac26a451483ddea3be4fafe620b8fa01669149b
parent ff20fd45c7b77182846631c20cae1fcfca5a58a8

Merge "Fix hardware protected path for AImageReader."

media/ndk/NdkImageReader.cpp

diff --git a/media/ndk/NdkImageReader.cpp b/media/ndk/NdkImageReader.cpp
index 1a0c3b1..010c1aa 100644
--- a/media/ndk/NdkImageReader.cpp
+++ b/media/ndk/NdkImageReader.cpp
@@ -308,6 +308,9 @@
         ALOGE("Failed to set BufferItemConsumer buffer dataSpace");
         return AMEDIA_ERROR_UNKNOWN;
     }
+    if (mUsage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT) {
+        gbConsumer->setConsumerIsProtected(true);
+    }
 
     mSurface = new Surface(mProducer, /*controlledByApp*/true);
     if (mSurface == nullptr) {