commit b5625ce949ceb29e5971b6e2c94d9ee054c057d7
author Jiwen 'Steve' Cai <jwcai@google.com> Fri Apr 21 19:00:58 2017 -0700
committer Jiwen 'Steve' Cai <jwcai@google.com> Mon May 01 18:31:51 2017 -0700
tree 5619108c198fc073573db1954174182f1b6331b5
parent 76e360332d7e0e4c0c132bf712c14f5a8ee2a217

SurfaceUtils: query CONSUMER_IS_PROTECTED

Using NATIVE_WINDOW_CONSUMER_IS_PROTECTED to check whether a native
window can handle protected buffers instead of expecting
GRALLOC_USAGE_PROTECTED as a consumer usage flag.

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

Change-Id: I67a324161dff22e6efd949f2ab988c2349cd6bcc

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index b6b315d..b7c1598 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -91,9 +91,19 @@
             return err;
         }
 
-        // Check if the ANativeWindow uses hardware protected buffers.
-        if (queuesToNativeWindow != 1 && !(consumerUsage & GRALLOC_USAGE_PROTECTED)) {
-            ALOGE("native window could not be authenticated");
+        // Check if the consumer end of the ANativeWindow can handle protected content.
+        int isConsumerProtected = 0;
+        err = nativeWindow->query(
+                nativeWindow, NATIVE_WINDOW_CONSUMER_IS_PROTECTED, &isConsumerProtected);
+        if (err != NO_ERROR) {
+            ALOGE("error query native window: %s (%d)", strerror(-err), -err);
+            return err;
+        }
+
+        // Deny queuing into native window if neither condition is satisfied.
+        if (queuesToNativeWindow != 1 && isConsumerProtected != 1) {
+            ALOGE("native window cannot handle protected buffers: the consumer should either be "
+                  "a hardware composer or support hardware protection");
             return PERMISSION_DENIED;
         }
     }