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

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

Merge "Adds hasArrSupport api support" into main

parents 67b101b5 89fbb6e4

libs/gui/SurfaceComposerClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2807,6 +2807,7 @@ void SurfaceComposerClient::getDynamicDisplayInfoInternal(gui::DynamicDisplayInf 
    outInfo->autoLowLatencyModeSupported = ginfo.autoLowLatencyModeSupported;

    outInfo->gameContentTypeSupported = ginfo.gameContentTypeSupported;

    outInfo->preferredBootDisplayMode = ginfo.preferredBootDisplayMode;

    outInfo->hasArrSupport = ginfo.hasArrSupport;

}



status_t SurfaceComposerClient::getDynamicDisplayInfoFromId(int64_t displayId,

libs/gui/aidl/android/gui/DynamicDisplayInfo.aidl

+3 −0
Original line number Diff line number Diff line
@@ -43,4 +43,7 @@ parcelable DynamicDisplayInfo { 


    // The boot display mode preferred by the implementation.

    int preferredBootDisplayMode;



    // Represents whether display supports ARR.

    boolean hasArrSupport;

}

libs/ui/include/ui/DynamicDisplayInfo.h

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ struct DynamicDisplayInfo { 
    ui::DisplayModeId preferredBootDisplayMode;



    std::optional<ui::DisplayMode> getActiveDisplayMode() const;



    bool hasArrSupport;

};



} // namespace android::ui

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1215,6 +1215,7 @@ void SurfaceFlinger::getDynamicDisplayInfoInternal(ui::DynamicDisplayInfo*& info 
    const auto mode = display->refreshRateSelector().getActiveMode();

    info->activeDisplayModeId = ftl::to_underlying(mode.modePtr->getId());

    info->renderFrameRate = mode.fps.getValue();

    info->hasArrSupport = mode.modePtr->getVrrConfig() && FlagManager::getInstance().vrr_config();

    info->activeColorMode = display->getCompositionDisplay()->getState().colorMode;

    info->hdrCapabilities = filterOut4k30(display->getHdrCapabilities());
@@ -8639,6 +8640,7 @@ void SurfaceComposerAIDL::getDynamicDisplayInfoInternal(ui::DynamicDisplayInfo& 


    outInfo->activeDisplayModeId = info.activeDisplayModeId;

    outInfo->renderFrameRate = info.renderFrameRate;

    outInfo->hasArrSupport = info.hasArrSupport;



    outInfo->supportedColorModes.clear();

    outInfo->supportedColorModes.reserve(info.supportedColorModes.size());