commit 78fb96f3f8b40cba6b9e2cb2b0c332a45798b522
author Bo Hu <bohu@google.com> Fri Dec 14 20:50:18 2018 +0000
committer Bo Hu <bohu@google.com> Fri Dec 14 20:50:18 2018 +0000
tree 8a0b533d9571579691e8643c280a265345af2b95
parent dc979249d3bdd678e63358aacb27aa9a5cd02f51

Revert "[SurfaceFlinger] Add GPU protected content support."

This reverts commit dc979249d3bdd678e63358aacb27aa9a5cd02f51.

Reason for revert: broke emulator b/121038163

Change-Id: I3c93fe7d91431a3000094915c909811d1796305d

libs/renderengine/gl/GLFramebuffer.cpp

diff --git a/libs/renderengine/gl/GLFramebuffer.cpp b/libs/renderengine/gl/GLFramebuffer.cpp
index 4a519bb..f4de91a 100644
--- a/libs/renderengine/gl/GLFramebuffer.cpp
+++ b/libs/renderengine/gl/GLFramebuffer.cpp
@@ -39,7 +39,7 @@
     eglDestroyImageKHR(mEGLDisplay, mEGLImage);
 }
 
-bool GLFramebuffer::setNativeWindowBuffer(ANativeWindowBuffer* nativeBuffer, bool isProtected) {
+bool GLFramebuffer::setNativeWindowBuffer(ANativeWindowBuffer* nativeBuffer) {
     if (mEGLImage != EGL_NO_IMAGE_KHR) {
         eglDestroyImageKHR(mEGLDisplay, mEGLImage);
         mEGLImage = EGL_NO_IMAGE_KHR;
@@ -48,13 +48,8 @@
     }
 
     if (nativeBuffer) {
-        EGLint attributes[] = {
-                isProtected ? EGL_PROTECTED_CONTENT_EXT : EGL_NONE,
-                isProtected ? EGL_TRUE : EGL_NONE,
-                EGL_NONE,
-        };
         mEGLImage = eglCreateImageKHR(mEGLDisplay, EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID,
-                                      nativeBuffer, attributes);
+                                      nativeBuffer, nullptr);
         if (mEGLImage == EGL_NO_IMAGE_KHR) {
             return false;
         }