commit f1831a120a44ef9260eb16191195a7db5d6c03d7
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jan 18 19:17:40 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 18 19:17:40 2018 +0000
tree e47ef5a1ef2261b6e1b095a80c83a84e1ca4a94d
parent 02ba2b5b3b68faa7474de91c9668a486682baf67
parent 8acf5a0acc2d45d090bbc25fa8bbb07ce1076e40

Merge "SurfaceFlinger: Do not capture rounded corners on screenshots"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 27b9e93..a91525d 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4645,6 +4645,9 @@
             continue;
         }
         layer->traverseInZOrder(LayerVector::StateSet::Drawing, [&](Layer* layer) {
+            if (!layer->belongsToDisplay(hw->getLayerStack(), false)) {
+                return;
+            }
             if (!layer->isVisible()) {
                 return;
             }