commit 7ea1dc7fc863079c36e9ceedac255f3490a98f4a
author Dan Stoza <stoza@google.com> Tue Jun 05 11:06:44 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 05 11:06:44 2018 -0700
tree b262bad9d6d9427c6337a21aec1b5562f5122ef9
parent 682dcb46712567b7cd8d76c987bac4e313dbadb2
parent 3c4c307c9e499c1a966ad05ef5f7abd787ec61a1

Merge "SF: Add workaround to release screenshot buffer" into pi-dev am: 6fa25f9d8f
am: 3c4c307c9e

Change-Id: I8cac129192c9107a32567cb4e8857aaab5d24a6f

services/surfaceflinger/RenderEngine/RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index 4c878ae..c2233f9 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -427,6 +427,12 @@
     // back to main framebuffer
     unbindFramebuffer(bindHelper->mTexName, bindHelper->mFbName);
     eglDestroyImageKHR(mEGLDisplay, bindHelper->mImage);
+
+    // Workaround for b/77935566 to force the EGL driver to release the
+    // screenshot buffer
+    setScissor(0, 0, 0, 0);
+    clearWithColor(0.0, 0.0, 0.0, 0.0);
+    disableScissor();
 }
 
 // ---------------------------------------------------------------------------