commit a3e1d7b43eeee44ab80571bd4a0c2425b443d578
author Jiwen 'Steve' Cai <jwcai@google.com> Fri Apr 21 19:05:01 2017 -0700
committer Jiwen 'Steve' Cai <jwcai@google.com> Mon May 01 16:47:46 2017 -0700
tree 9cd9f03a3abf0945d296d9b5b91826cf924a6d20
parent ba9b2ce254e507fe1fa51194236b9e41562fc91b

SurfaceTexture: setConsumerIsProtected

When in a protected context, SurfaceTexture should call
setConsumerIsProtected Instead of setting consumer usage bits to
indicate the producer that the consumer can handle protected content.

Bug: 35726763
Test: videoplayer-nodrm-protected.apk and videoplayer-drm-protected.apk
both works.

Change-Id: I0028c040e727691e1e42226c0b66de075fe5515d

core/jni/android/graphics/SurfaceTexture.cpp

diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
index 14bad0f..9242b70 100644
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -286,9 +286,7 @@
             createProcessUniqueId()));
 
     // If the current context is protected, inform the producer.
-    if (isProtectedContext()) {
-        consumer->setConsumerUsageBits(GRALLOC_USAGE_PROTECTED);
-    }
+    consumer->setConsumerIsProtected(isProtectedContext());
 
     SurfaceTexture_setSurfaceTexture(env, thiz, surfaceTexture);
     SurfaceTexture_setProducer(env, thiz, producer);