diff options
| author | Ady Abraham <adyabr@google.com> | 2021-07-13 23:57:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-13 23:57:44 +0000 |
| commit | f57a4d8a480e063c4e5b0bf419ebcf06a6e3a36e (patch) | |
| tree | c4f4a1b8b576d7f702ed7ef77ea5b51f419932f0 | |
| parent | a3deda207fc1fa1334b3e1dba4664b92efc349b4 (diff) | |
| parent | 311ea1b9e8cf457a554c006691b08da848b1f3a6 (diff) | |
| download | native-f57a4d8a480e063c4e5b0bf419ebcf06a6e3a36e.tar.gz | |
Merge "SF: don't skip draw for clearContent" into sc-dev am: 311ea1b9e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15276470
Change-Id: Ie7167cc2ae4d32844f717d40f76dd89e83affd95
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 4 |
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(); |