commit 17fb1d32a398800ce25d7b1fff473cf3de4b26e0
author Vishnu Nair <vishnun@google.com> Thu Jan 19 01:10:27 2023 +0000
committer Vishnu Nair <vishnun@google.com> Thu Jan 19 02:50:10 2023 +0000
tree 6b79c4bdde67f71e68cc6fb6235a904122179751
parent 1e1a387877dcee28fa1a8d80c0745b9ec7174dea

SF: Fix hdr info listeners

Avoid calling into layerFE for output filter since layerFE
does contain any layer state outside of composition
engine present call. Instead get the output filter from
layer.

Bug: 261135980
Test: TBD
Change-Id: Ib7262db9218e46f547950c67d1280bb3ac6b8736

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 2d8b9c1..e8dc7d4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1833,17 +1833,6 @@
     return NO_ERROR;
 }
 
-bool SurfaceFlinger::hasVisibleHdrLayer(const sp<DisplayDevice>& display) {
-    bool hasHdrLayers = false;
-    mDrawingState.traverse([&,
-                            compositionDisplay = display->getCompositionDisplay()](Layer* layer) {
-        hasHdrLayers |= (layer->isVisible() &&
-                         compositionDisplay->includesLayer(layer->getCompositionEngineLayerFE()) &&
-                         isHdrDataspace(layer->getDataSpace()));
-    });
-    return hasHdrLayers;
-}
-
 status_t SurfaceFlinger::setDisplayBrightness(const sp<IBinder>& displayToken,
                                               const gui::DisplayBrightness& brightness) {
     if (!displayToken) {
@@ -2638,7 +2627,8 @@
             int32_t maxArea = 0;
             mDrawingState.traverse([&, compositionDisplay = compositionDisplay](Layer* layer) {
                 const auto layerFe = layer->getCompositionEngineLayerFE();
-                if (layer->isVisible() && compositionDisplay->includesLayer(layerFe)) {
+                if (layer->isVisible() &&
+                    compositionDisplay->includesLayer(layer->getOutputFilter())) {
                     if (isHdrLayer(layer)) {
                         const auto* outputLayer =
                             compositionDisplay->getOutputLayerForLayer(layerFe);