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

Commit e05ca50f authored by Peiyong Lin's avatar Peiyong Lin Committed by android-build-merger
Browse files

Merge "Query legacy ConfigStore for use color management API." into qt-dev am: 93c25942 

am: 28162488

Change-Id: I8017f194ca5cbf468f45b2ad0d20d0463a58700f
parents d5ca079b 28162488

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -302,8 +302,8 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 


    mDefaultCompositionDataspace =

            static_cast<ui::Dataspace>(default_composition_dataspace(Dataspace::V0_SRGB));

    mWideColorGamutCompositionDataspace =

            static_cast<ui::Dataspace>(wcg_composition_dataspace(Dataspace::V0_SRGB));

    mWideColorGamutCompositionDataspace = static_cast<ui::Dataspace>(wcg_composition_dataspace(

            hasWideColorDisplay ? Dataspace::DISPLAY_P3 : Dataspace::V0_SRGB));

    defaultCompositionDataspace = mDefaultCompositionDataspace;

    wideColorGamutCompositionDataspace = mWideColorGamutCompositionDataspace;

    defaultCompositionPixelFormat = static_cast<ui::PixelFormat>(

services/surfaceflinger/SurfaceFlingerProperties.cpp

+2 −6
Original line number Diff line number Diff line
@@ -177,15 +177,11 @@ SurfaceFlingerProperties::primary_display_orientation_values primary_display_ori 


bool use_color_management(bool defaultValue) {

    auto tmpuseColorManagement = SurfaceFlingerProperties::use_color_management();

    auto tmpHasHDRDisplay = SurfaceFlingerProperties::has_HDR_display();

    auto tmpHasWideColorDisplay = SurfaceFlingerProperties::has_wide_color_display();

    auto tmpHasHDRDisplayVal = has_HDR_display(defaultValue);

    auto tmpHasWideColorDisplayVal = has_wide_color_display(defaultValue);



    auto tmpuseColorManagementVal = tmpuseColorManagement.has_value() ? *tmpuseColorManagement :

        defaultValue;

    auto tmpHasHDRDisplayVal = tmpHasHDRDisplay.has_value() ? *tmpHasHDRDisplay :

        defaultValue;

    auto tmpHasWideColorDisplayVal = tmpHasWideColorDisplay.has_value() ? *tmpHasWideColorDisplay :

        defaultValue;



    return tmpuseColorManagementVal || tmpHasHDRDisplayVal || tmpHasWideColorDisplayVal;

}