commit dea97b7aa2b5cfbb7d42f30bcbf86a01778b609b
author Jesse Hall <jessehall@google.com> Tue May 03 21:12:39 2016 -0700
committer Jesse Hall <jessehall@google.com> Tue May 03 21:12:39 2016 -0700
tree 4c5a48e76d2da9fdcc5852b7d654b94ea63ac1a9
parent 5dda72b2a14c7d81756ec019d0f8daac228dca45

GLConsumer: add build-time disable of gpu protected content

Some drivers incorrectly claim support for EGL_EXT_protected_content.
Until we've been able to verify that devices which claim support
actually implement it properly, require that GPU access to protected
content be manually enabled per-device.

Bug: 28545166
Change-Id: Ic10e47a99c38737ce1c39439fe9347d628aec491

libs/gui/GLConsumer.cpp

diff --git a/libs/gui/GLConsumer.cpp b/libs/gui/GLConsumer.cpp
index ac8bc6e..7a1ad46 100644
--- a/libs/gui/GLConsumer.cpp
+++ b/libs/gui/GLConsumer.cpp
@@ -135,7 +135,8 @@
     bool atEnd = (cropExtLen+1) < extsLen &&
             !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));
     bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");
-    return equal || atStart || atEnd || inMiddle;
+    return ENABLE_GPU_PROTECTED_CONTENT &&
+            (equal || atStart || atEnd || inMiddle);
 }
 
 static bool hasEglProtectedContent() {