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

Commit 78cb7bc5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SurfaceFlinger_test on WCG devices" into udc-dev am: 19a4a081 am:... 

Merge "Fix SurfaceFlinger_test on WCG devices" into udc-dev am: 19a4a081 am: 9ee046f5 am: c6d711dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23358872



Change-Id: I74c128c6226f1a2324902added8981a856d8a55a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f318357d c6d711dd

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -7038,9 +7038,9 @@ status_t SurfaceFlinger::captureDisplay(const DisplayCaptureArgs& args, 
    }



    RenderAreaFuture renderAreaFuture = ftl::defer([=] {

        return DisplayRenderArea::create(displayWeak, args.sourceCrop, reqSize,

                                         ui::Dataspace::UNKNOWN, args.useIdentityTransform,

                                         args.hintForSeamlessTransition, args.captureSecureLayers);

        return DisplayRenderArea::create(displayWeak, args.sourceCrop, reqSize, args.dataspace,

                                         args.useIdentityTransform, args.hintForSeamlessTransition,

                                         args.captureSecureLayers);

    });



    GetLayerSnapshotsFunction getLayerSnapshots;