summaryrefslogtreecommitdiff
path: root/media/jni/android_media_ImageReader.cpp
diff options
context:
space:
mode:
authorKhushal <khushalsagar@google.com>2019-01-25 14:12:14 -0800
committerKhushal <khushalsagar@google.com>2019-01-25 14:21:58 -0800
commit65d19416401b95420413a0c7403825663e5493d4 (patch)
tree351e7fbbb926483216f802f19181906c27047bfb /media/jni/android_media_ImageReader.cpp
parent90a0a466fa733dcd56516e57117d90e7f0702333 (diff)
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
Diffstat (limited to 'media/jni/android_media_ImageReader.cpp')
-rw-r--r--media/jni/android_media_ImageReader.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp
index a45aa90f5f19..417a427b6c7c 100644
--- a/media/jni/android_media_ImageReader.cpp
+++ b/media/jni/android_media_ImageReader.cpp
@@ -405,6 +405,11 @@ static void ImageReader_init(JNIEnv* env, jobject thiz, jobject weakThiz, jint w
nativeFormat, consumerUsage);
return;
}
+
+ if (consumerUsage & GRALLOC_USAGE_PROTECTED) {
+ gbConsumer->setConsumerIsProtected(true);
+ }
+
ctx->setBufferConsumer(bufferConsumer);
bufferConsumer->setName(consumerName);