commit 65d19416401b95420413a0c7403825663e5493d4
author Khushal <khushalsagar@google.com> Fri Jan 25 14:12:14 2019 -0800
committer Khushal <khushalsagar@google.com> Fri Jan 25 14:21:58 2019 -0800
tree 351e7fbbb926483216f802f19181906c27047bfb
parent 90a0a466fa733dcd56516e57117d90e7f0702333

Fix hardware protected path for SDK ImageReader.

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

BUG: crbug.com/889328
Test: Manual testing.

Change-Id: Ibf898aed08ce6d1030aa8eeb4b240a63c4032058

media/jni/android_media_ImageReader.cpp

diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index a45aa90..417a427 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -405,6 +405,11 @@
                 nativeFormat, consumerUsage);
         return;
     }
+
+    if (consumerUsage & GRALLOC_USAGE_PROTECTED) {
+        gbConsumer->setConsumerIsProtected(true);
+    }
+
     ctx->setBufferConsumer(bufferConsumer);
     bufferConsumer->setName(consumerName);