summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdy Abraham <adyabr@google.com>2021-07-13 23:43:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-07-13 23:43:46 +0000
commit311ea1b9e8cf457a554c006691b08da848b1f3a6 (patch)
treec4f4a1b8b576d7f702ed7ef77ea5b51f419932f0
parente78acd5b6ac88cdedc20b1bf3a04960e56dd7772 (diff)
parentbaa6cf585169c9d2f87c2033785992953b265692 (diff)
downloadnative-311ea1b9e8cf457a554c006691b08da848b1f3a6.tar.gz
Merge "SF: don't skip draw for clearContent" into sc-dev
-rw-r--r--services/surfaceflinger/Layer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 00e043289a..bbe2c3e575 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -580,8 +580,8 @@ std::optional<compositionengine::LayerFE::LayerSettings> Layer::prepareClientCom
layerSettings.geometry.positionTransform = getTransform().asMatrix4();
// skip drawing content if the targetSettings indicate the content will be occluded
- layerSettings.skipContentDraw =
- layerSettings.skipContentDraw || !targetSettings.realContentIsVisible;
+ const bool drawContent = targetSettings.realContentIsVisible || targetSettings.clearContent;
+ layerSettings.skipContentDraw = !drawContent;
if (hasColorTransform()) {
layerSettings.colorTransform = getColorTransform();