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

Commit dfcb10db authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "SF: Fix unit tests re-registering a display" into udc-dev am: 89d7a127 

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



Change-Id: Iada73ad0e3bb492af31143c5c17a47c191da77bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7252ad40 89d7a127

services/surfaceflinger/tests/unittests/CompositionTest.cpp

+10 −7
Original line number Diff line number Diff line
@@ -284,12 +284,15 @@ struct BaseDisplayVariant { 
        constexpr auto kDisplayConnectionType = ui::DisplayConnectionType::Internal;

        constexpr bool kIsPrimary = true;



        test->mDisplay = FakeDisplayDeviceInjector(test->mFlinger, compositionDisplay,

        test->mDisplay =

                FakeDisplayDeviceInjector(test->mFlinger, compositionDisplay,

                                          kDisplayConnectionType, HWC_DISPLAY, kIsPrimary)

                        .setDisplaySurface(test->mDisplaySurface)

                        .setNativeWindow(test->mNativeWindow)

                        .setSecure(Derived::IS_SECURE)

                        .setPowerMode(Derived::INIT_POWER_MODE)

                        .setRefreshRateSelector(test->mFlinger.scheduler()->refreshRateSelector())

                        .skipRegisterDisplay()

                        .inject();

        Mock::VerifyAndClear(test->mNativeWindow.get());

services/surfaceflinger/tests/unittests/SurfaceFlinger_PowerHintTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ void SurfaceFlingerPowerHintTest::SetUp() { 
                    .setDisplaySurface(mDisplaySurface)

                    .setNativeWindow(mNativeWindow)

                    .setPowerMode(hal::PowerMode::ON)

                    .setRefreshRateSelector(mFlinger.scheduler()->refreshRateSelector())

                    .skipRegisterDisplay()

                    .inject();

}

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+7 −1
Original line number Diff line number Diff line
@@ -855,6 +855,11 @@ public: 
            return *this;

        }



        auto& skipRegisterDisplay() {

            mRegisterDisplay = false;

            return *this;

        }



        sp<DisplayDevice> inject() NO_THREAD_SAFETY_ANALYSIS {

            const auto displayId = mCreationArgs.compositionDisplay->getDisplayId();
@@ -918,7 +923,7 @@ public: 
                                                                      ui::ColorModes(),

                                                                      std::nullopt);



                if (mFlinger.scheduler()) {

                if (mFlinger.scheduler() && mRegisterDisplay) {

                    mFlinger.scheduler()->registerDisplay(physicalId,

                                                          display->holdRefreshRateSelector());

                }
@@ -937,6 +942,7 @@ public: 
        sp<BBinder> mDisplayToken = sp<BBinder>::make();

        DisplayDeviceCreationArgs mCreationArgs;

        DisplayModes mDisplayModes;

        bool mRegisterDisplay = true;

        const std::optional<ui::DisplayConnectionType> mConnectionType;

        const std::optional<hal::HWDisplayId> mHwcDisplayId;

    };