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

Commit 5cb8ade7 authored by Alec Mouri's avatar Alec Mouri Committed by Android (Google) Code Review
Browse files

Merge "Rename DisplayMode::refreshRate to peakRefreshRate" into main

parents 879a3630 55e3103c

libs/gui/SurfaceComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2604,7 +2604,7 @@ void SurfaceComposerClient::getDynamicDisplayInfoInternal(gui::DynamicDisplayInf 
        outMode.resolution.height = mode.resolution.height;

        outMode.xDpi = mode.xDpi;

        outMode.yDpi = mode.yDpi;

        outMode.refreshRate = mode.refreshRate;

        outMode.peakRefreshRate = mode.peakRefreshRate;

        outMode.vsyncRate = mode.vsyncRate;

        outMode.appVsyncOffset = mode.appVsyncOffset;

        outMode.sfVsyncOffset = mode.sfVsyncOffset;

libs/gui/aidl/android/gui/DisplayMode.aidl

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ parcelable DisplayMode { 
    int[] supportedHdrTypes;



    // Some modes have peak refresh rate lower than the panel vsync rate.

    float refreshRate = 0.0f;

    float peakRefreshRate = 0.0f;

    float vsyncRate = 0.0f;

    long appVsyncOffset = 0;

    long sfVsyncOffset = 0;

libs/gui/tests/EndToEndNativeInputTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ public: 
        // After a new buffer is queued, SurfaceFlinger is notified and will

        // latch the new buffer on next vsync.  Let's heuristically wait for 3

        // vsyncs.

        mBufferPostDelay = static_cast<int32_t>(1e6 / mode.refreshRate) * 3;

        mBufferPostDelay = static_cast<int32_t>(1e6 / mode.peakRefreshRate) * 3;

    }



    void TearDown() {

libs/nativedisplay/ADisplay.cpp

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int ADisplay_acquirePhysicalDisplays(ADisplay*** outDisplays) { 
            const ui::DisplayMode& mode = modes[j];

            modesPerDisplay[i].emplace_back(

                    DisplayConfigImpl{static_cast<size_t>(mode.id), mode.resolution.getWidth(),

                                      mode.resolution.getHeight(), mode.refreshRate,

                                      mode.resolution.getHeight(), mode.peakRefreshRate,

                                      mode.sfVsyncOffset, mode.appVsyncOffset});

        }

    }

libs/ui/include/ui/DisplayMode.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct DisplayMode { 
    std::vector<ui::Hdr> supportedHdrTypes;



    // Some modes have peak refresh rate lower than the panel vsync rate.

    float refreshRate = 0.f;

    float peakRefreshRate = 0.f;

    float vsyncRate = 0.f;

    nsecs_t appVsyncOffset = 0;

    nsecs_t sfVsyncOffset = 0;