commit ff20fd45c7b77182846631c20cae1fcfca5a58a8
author Khushal <khushalsagar@google.com> Tue Jan 22 15:31:00 2019 -0800
committer Khushal Sagar <khushalsagar@google.com> Fri Jan 25 20:05:50 2019 +0000
tree e8bb65daf196916cdb00c3907ba43ef237baacea
parent 6b6536968fd9a91ce0c71f09a00f1c11d85cebdc

Fix hardware protected path for AImageReader.

Ensure IGraphicBufferConsumer is marked protected for AImageReader if
the client requests AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT usage.

BUG: crbug.com/889328
Test: Manual testing.
Change-Id: Ic5a866cd294f44fc3669bbd1fdf0ab4a25b3239f

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) {