Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d04ada8 authored by Chia-I Wu's avatar Chia-I Wu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "sf-tests" 

* changes:
  surfaceflinger: enable LayerTransactionTest in presubmit
  surfaceflinger: fix traverseLayersInDisplay
  surfaceflinger: add more setFinalCrop tests
  surfaceflinger: add more setCrop tests
  surfaceflinger: add setOverrideScalingMode tests
  surfaceflinger: add more setMatrix tests
  surfaceflinger: add more setLayerStack tests
  surfaceflinger: add more setColor tests
  surfaceflinger: add more setAlpha tests
  surfaceflinger: add setTransparentRegionHint tests
  surfaceflinger: add more setFlags tests
  surfaceflinger: add more setRelativeLayer tests
  surfaceflinger: add more setLayer tests
  surfaceflinger: add more setSize tests
  surfaceflinger: add more setPosition tests
  surfaceflinger: run clang-format on Transaction_test.cpp
parents 123704e1 a706a2f6

services/surfaceflinger/SurfaceFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -4762,7 +4762,8 @@ void SurfaceFlinger::traverseLayersInDisplay(const sp<const DisplayDevice>& hw, 
            continue;

        }

        const Layer::State& state(layer->getDrawingState());

        if (state.z < minLayerZ || state.z > maxLayerZ) {

        // relative layers are traversed in Layer::traverseInZOrder

        if (state.zOrderRelativeOf != nullptr || state.z < minLayerZ || state.z > maxLayerZ) {

            continue;

        }

        layer->traverseInZOrder(LayerVector::StateSet::Drawing, [&](Layer* layer) {

services/surfaceflinger/tests/SurfaceFlinger_test.filter

+2 −2
Original line number Diff line number Diff line 
{

        "presubmit": {

            "filter": "LayerUpdateTest.*:ChildLayerTest.*:SurfaceFlingerStress.*:CropLatchingTest.*:GeometryLatchingTest.*:LayerColorTest.*"

            "filter": "LayerTransactionTest.*:LayerUpdateTest.*:ChildLayerTest.*:SurfaceFlingerStress.*:CropLatchingTest.*:GeometryLatchingTest.*"

        }

}

services/surfaceflinger/tests/Transaction_test.cpp

+1455 −715

File changed.

Preview size limit exceeded, changes collapsed.