commit 836800931c463cfa105b0e454028dc884b899309
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 17 07:11:11 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 17 07:11:11 2018 +0000
tree b7b16491c514ec9f660a879bc3348df4b99d6dd1
parent dfabb598c3e4d4b2f264f3dcc30bd7bf3b0ebea2
parent 2eae6d383ad9973080296a9684db1ad691947e19

Merge "SurfaceFlinger: Consider parent alpha as well"

services/surfaceflinger/ColorLayer.cpp

diff --git a/services/surfaceflinger/ColorLayer.cpp b/services/surfaceflinger/ColorLayer.cpp
index bf4a859..884aedd 100644
--- a/services/surfaceflinger/ColorLayer.cpp
+++ b/services/surfaceflinger/ColorLayer.cpp
@@ -68,8 +68,7 @@
 }
 
 bool ColorLayer::isVisible() const {
-    const Layer::State& s(getDrawingState());
-    return !isHiddenByPolicy() && s.color.a;
+    return !isHiddenByPolicy() && getAlpha() > 0.0f;
 }
 
 void ColorLayer::setPerFrameData(const sp<const DisplayDevice>& display) {

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 63e058a..2d6d470 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3214,7 +3214,8 @@
                 case HWC2::Composition::SolidColor: {
                     const Layer::State& state(layer->getDrawingState());
                     if (layer->getClearClientTarget(displayId) && !firstLayer &&
-                        layer->isOpaque(state) && (state.color.a == 1.0f) && hasClientComposition) {
+                        layer->isOpaque(state) && (layer->getAlpha() == 1.0f) &&
+                        hasClientComposition) {
                         // never clear the very first layer since we're
                         // guaranteed the FB is already cleared
                         layer->clearWithOpenGL(renderArea);