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

Commit 9cda20d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "surfaceflinger: fix misplacement of getHwComposer related function"

parents 36e49163 6753a021

services/surfaceflinger/SurfaceFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2225,7 +2225,9 @@ sp<DisplayDevice> SurfaceFlinger::setupNewDisplayDeviceInternal( 
                    getHwComposer().getRenderIntents(displayId, colorMode);

            hwcColorModes.emplace(colorMode, renderIntents);

        }

    }



    if (displayId >= 0) {

        getHwComposer().getHdrCapabilities(displayId, &hdrCapabilities);

        supportedPerFrameMetadata = getHwComposer().getSupportedPerFrameMetadata(displayId);

    }

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ using NonHwcVirtualDisplayCase = 
using SimpleHwcVirtualDisplayVariant = HwcVirtualDisplayVariant<1024, 768, Secure::TRUE>;

using HwcVirtualDisplayCase =

        Case<SimpleHwcVirtualDisplayVariant, WideColorSupportNotConfiguredVariant,

             NonHwcDisplayHdrSupportVariant, NonHwcPerFrameMetadataSupportVariant>;

             HdrNotSupportedVariant<SimpleHwcVirtualDisplayVariant>, 

             NoPerFrameMetadataSupportVariant<SimpleHwcVirtualDisplayVariant>>;

using WideColorP3ColorimetricDisplayCase =

        Case<PrimaryDisplayVariant, WideColorP3ColorimetricSupportedVariant<PrimaryDisplayVariant>,

             HdrNotSupportedVariant<PrimaryDisplayVariant>,