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

Commit ef9fb68e authored by Rachel Lee's avatar Rachel Lee
Browse files

GTE frame rate compatibility needs validation 

Validate the GTE frame rate compatibility value, otherwise it does not
reach SF.

Bug: 327013543
Test: atest FrameRateUtilsTest
Test: atest CtsSurfaceControlTestsStaging
Change-Id: I3cb7fc7c9cbd32eb8db8e07718a89c3918b72a9f
parent 5ecb69f5

libs/gui/FrameRateUtils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ bool ValidateFrameRate(float frameRate, int8_t compatibility, int8_t changeFrame 


    if (compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT &&

        compatibility != ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE &&

        compatibility != ANATIVEWINDOW_FRAME_RATE_GTE &&

        (!privileged ||

         (compatibility != ANATIVEWINDOW_FRAME_RATE_EXACT &&

          compatibility != ANATIVEWINDOW_FRAME_RATE_NO_VOTE))) {

libs/gui/tests/FrameRateUtilsTest.cpp

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ TEST(FrameRateUtilsTest, ValidateFrameRate) { 
                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ALWAYS, ""));

    EXPECT_TRUE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,

                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS, ""));

    EXPECT_TRUE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_GTE,

                                  ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS, ""));



    // Privileged APIs.

    EXPECT_FALSE(ValidateFrameRate(60.0f, ANATIVEWINDOW_FRAME_RATE_EXACT,

services/surfaceflinger/Scheduler/RefreshRateSelector.cpp

+1 −0
Original line number Diff line number Diff line
@@ -972,6 +972,7 @@ auto RefreshRateSelector::getFrameRateOverrides(const std::vector<LayerRequireme 
            LOG_ALWAYS_FATAL_IF(layer->vote != LayerVoteType::ExplicitDefault &&

                                        layer->vote != LayerVoteType::ExplicitExactOrMultiple &&

                                        layer->vote != LayerVoteType::ExplicitExact &&

                                        layer->vote != LayerVoteType::ExplicitGte &&

                                        layer->vote != LayerVoteType::ExplicitCategory,

                                "Invalid layer vote type for frame rate overrides");

            for (auto& [fps, score] : scoredFrameRates) {