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

Commit 13ffa1d1 authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

Merge "composer: vts: changing config groups should not check newVsyncAppliedTimeNanos" into main

parents 4e7463cc b2419270

graphics/composer/2.4/vts/functional/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 
    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalGraphicsComposerV2_4TargetTest" />

        <option name="native-test-timeout" value="900000"/>

        <option name="native-test-timeout" value="1800000"/>

    </test>

</configuration>

graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp

+6 −4
Original line number Diff line number Diff line
@@ -544,10 +544,12 @@ void GraphicsComposerHidlTest::Test_setActiveConfigWithConstraints(const TestPar 
                      setActiveConfigWithConstraints(display, config2, constraints, &timeline));



            EXPECT_TRUE(timeline.newVsyncAppliedTimeNanos >= constraints.desiredTimeNanos);

            if (configGroup1 == configGroup2) {

                // Refresh rate should change within a reasonable time

            constexpr std::chrono::nanoseconds kReasonableTimeForChange = 1s;  // 1 second

                constexpr std::chrono::nanoseconds kReasonableTimeForChange = 1s;

                EXPECT_TRUE(timeline.newVsyncAppliedTimeNanos - constraints.desiredTimeNanos <=

                            kReasonableTimeForChange.count());

            }



            if (timeline.refreshRequired) {

                if (params.refreshMiss) {