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

Commit 1f38ae3e authored by Su Hong Koo's avatar Su Hong Koo Committed by Android (Google) Code Review
Browse files

Merge "SF: Fix edge case in SchedulerTest related to pacesetter_selection" into main

parents 47acdca3 761bc2da

services/surfaceflinger/tests/unittests/SchedulerTest.cpp

+3 −1
Original line number Diff line number Diff line
@@ -872,6 +872,9 @@ TEST_F(SchedulerTest, enablesLayerCachingTexturePoolForPacesetter) { 
    EXPECT_CALL(mSchedulerCallback, enableLayerCachingTexturePool(kDisplayId2, false));

    mScheduler->setDisplayPowerMode(kDisplayId2, hal::PowerMode::OFF);

    EXPECT_EQ(mScheduler->pacesetterDisplayId(), kDisplayId1);



    // Flush EXPECT_CALLs here so that additional mock calls in the dtor does not trigger a failure.

    testing::Mock::VerifyAndClearExpectations(&mSchedulerCallback);

}



TEST_F(SchedulerTest, pendingModeChangeSingleDisplay) {
@@ -890,7 +893,6 @@ TEST_F(SchedulerTest, pendingModeChangeSingleDisplay) { 


TEST_F(SchedulerTest, pendingModeChangeMultiDisplay) {

    SET_FLAG_FOR_TEST(flags::pacesetter_selection, true);

    SET_FLAG_FOR_TEST(flags::pacesetter_selection, true);



    mScheduler->registerDisplay(kDisplayId2,

                                std::make_shared<RefreshRateSelector>(kDisplay2Modes,