From c6f216955966e93ea983ba800e651af3de6c90e3 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Fri, 11 Oct 2013 11:16:03 -0700 Subject: [PATCH] Use black for blackout layer SurfaceFlinger was rendering dark purple for secure content, which showed up when we took a screen shot for the orientation change animation. Use black instead. Bug 11157921 Change-Id: I3895e8168891d49dc5b84eed599bcd0a303bb70a --- services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp | 2 +- services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp index 1cd8cb34c..521a5d261 100644 --- a/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES11RenderEngine.cpp @@ -46,7 +46,7 @@ GLES11RenderEngine::GLES11RenderEngine() { } } pack565; - const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; + const uint16_t protTexData[] = { 0 }; glGenTextures(1, &mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp index 7112ca8d2..a2a6270fd 100644 --- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp +++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp @@ -50,7 +50,7 @@ GLES20RenderEngine::GLES20RenderEngine() : } } pack565; - const uint16_t protTexData[] = { pack565(0x03, 0x03, 0x03) }; + const uint16_t protTexData[] = { 0 }; glGenTextures(1, &mProtectedTexName); glBindTexture(GL_TEXTURE_2D, mProtectedTexName); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);