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

Commit a4cf4de2 authored by Ram Indani's avatar Ram Indani Committed by Android (Google) Code Review
Browse files

Merge "[SF] Update to use RefreshRateChangedDebugData.refreshPeriodNanos" into main

parents 8a867151 19919ff8

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ bool AidlComposer::isSupported(OptionalFeature feature) const { 
    }

}



bool AidlComposer::getDisplayConfigurationsSupported() const {

bool AidlComposer::isVrrSupported() const {

    return mComposerInterfaceVersion >= 3 && FlagManager::getInstance().vrr_config();

}

services/surfaceflinger/DisplayHardware/AidlComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public: 
    ~AidlComposer() override;



    bool isSupported(OptionalFeature) const;

    bool getDisplayConfigurationsSupported() const;

    bool isVrrSupported() const;



    std::vector<aidl::android::hardware::graphics::composer3::Capability> getCapabilities()

            override;

services/surfaceflinger/DisplayHardware/ComposerHal.h

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public: 
    };



    virtual bool isSupported(OptionalFeature) const = 0;

    virtual bool getDisplayConfigurationsSupported() const = 0;

    virtual bool isVrrSupported() const = 0;



    virtual std::vector<aidl::android::hardware::graphics::composer3::Capability>

    getCapabilities() = 0;

services/surfaceflinger/DisplayHardware/HWComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ std::vector<HWComposer::HWCDisplayMode> HWComposer::getModes(PhysicalDisplayId d 


    const auto hwcDisplayId = mDisplayData.at(displayId).hwcDisplay->getId();



    if (mComposer->getDisplayConfigurationsSupported()) {

    if (mComposer->isVrrSupported()) {

        return getModesFromDisplayConfigurations(hwcDisplayId, maxFrameIntervalNs);

    }

services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ bool HidlComposer::isSupported(OptionalFeature feature) const { 
    }

}



bool HidlComposer::getDisplayConfigurationsSupported() const {

    // getDisplayConfigurations is not supported on the HIDL composer.

bool HidlComposer::isVrrSupported() const {

    // VRR is not supported on the HIDL composer.

    return false;

};