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

Commit 87d75327 authored by Cairn Overturf's avatar Cairn Overturf Committed by Android (Google) Code Review
Browse files

Merge "Fix virtual display screenshot test on tangor" into main

parents 1e9f87ea 28b5bb19

services/surfaceflinger/tests/TransactionTestHarnesses.h

+7 −3
Original line number Diff line number Diff line
@@ -48,7 +48,11 @@ public: 


                ui::DisplayMode displayMode;

                SurfaceComposerClient::getActiveDisplayMode(displayToken, &displayMode);

                const ui::Size& resolution = displayMode.resolution;

                ui::Size resolution = displayMode.resolution;

                if (displayState.orientation == ui::Rotation::Rotation90 ||

                    displayState.orientation == ui::Rotation::Rotation270) {

                    std::swap(resolution.width, resolution.height);

                }



                sp<IBinder> vDisplay;
@@ -93,8 +97,8 @@ public: 
#else

                t.setDisplaySurface(vDisplay, producer);

#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

                t.setDisplayProjection(vDisplay, displayState.orientation,

                                       Rect(displayState.layerStackSpaceRect), Rect(resolution));

                t.setDisplayProjection(vDisplay, ui::Rotation::Rotation0, Rect(resolution),

                                       Rect(resolution));

                t.setDisplayLayerStack(vDisplay, layerStack);

                t.setLayerStack(mirrorSc, layerStack);

                t.apply();