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

Commit b162b20e authored by Lloyd Pique's avatar Lloyd Pique Committed by android-build-merger
Browse files

Merge "SF: Fix unit test getColorModes() expectation" into pi-dev 

am: 2349051f

Change-Id: I9aa04a7d5d5a9078e0a1a8b47d48ad78dd3dd5c2
parents 7eb8b4cf 2349051f

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+1 −3
Original line number Diff line number Diff line
@@ -165,9 +165,7 @@ TEST_F(DisplayTransactionTest, processDisplayChangesLockedProcessesPrimaryDispla 


    EXPECT_CALL(*mComposer, getActiveConfig(DisplayDevice::DISPLAY_PRIMARY, _))

            .WillOnce(DoAll(SetArgPointee<1>(0), Return(Error::NONE)));

    EXPECT_CALL(*mComposer, getColorModes(DisplayDevice::DISPLAY_PRIMARY, _))

            .WillOnce(DoAll(SetArgPointee<1>(std::vector<ColorMode>({ColorMode::NATIVE})),

                            Return(Error::NONE)));

    EXPECT_CALL(*mComposer, getColorModes(DisplayDevice::DISPLAY_PRIMARY, _)).Times(0);

    EXPECT_CALL(*mComposer, getHdrCapabilities(DisplayDevice::DISPLAY_PRIMARY, _, _, _, _))

            .WillOnce(DoAll(SetArgPointee<1>(std::vector<Hdr>()), Return(Error::NONE)));