commit 47609db70942c8de5e435beba634127642f7344d
author neo.he <neo.he@mstarsemi.com> Tue Mar 28 18:34:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Mar 28 18:34:28 2017 +0000
tree a168ed2797422680c51704200f90db39ca822ce9
parent 674d3acd18a2efb251ae97b77c3e6207ef8742c2
parent 15feba03ae9118daa8c8cfb25147b0bea3cb5133

Merge changes If756ad2a,I19aeb7ac
am: 15feba03ae

Change-Id: Ib1842ab89d245fb5bde291a26c4952e0fc262aba

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
old mode 100644
new mode 100755
index 1b90678..0a795aa
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -1271,9 +1271,9 @@
 
 bool Layer::isOpaque(const Layer::State& s) const
 {
-    // if we don't have a buffer yet, we're translucent regardless of the
+    // if we don't have a buffer or sidebandStream yet, we're translucent regardless of the
     // layer's opaque flag.
-    if (mActiveBuffer == 0) {
+    if ((mSidebandStream == nullptr) && (mActiveBuffer == nullptr)) {
         return false;
     }
 

services/surfaceflinger/RenderEngine/RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/RenderEngine.cpp b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
index 2aec9e9..3af8a34 100644
--- a/services/surfaceflinger/RenderEngine/RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/RenderEngine.cpp
@@ -380,6 +380,7 @@
         attribs[EGL_RED_SIZE]                   = 8;
         attribs[EGL_GREEN_SIZE]                 = 8;
         attribs[EGL_BLUE_SIZE]                  = 8;
+        attribs[EGL_ALPHA_SIZE]                 = 8;
         wantedAttribute                         = EGL_NONE;
         wantedAttributeValue                    = EGL_NONE;
     } else {