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

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

Merge "No-op color management sysprop."

parents f76d573a 5f62a600

services/surfaceflinger/SurfaceFlinger.cpp

+0 −6
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ uint32_t SurfaceFlinger::maxGraphicsWidth; 
uint32_t SurfaceFlinger::maxGraphicsHeight;

bool SurfaceFlinger::hasWideColorDisplay;

ui::Rotation SurfaceFlinger::internalDisplayOrientation = ui::ROTATION_0;

bool SurfaceFlinger::useColorManagement;

bool SurfaceFlinger::useContextPriority;

Dataspace SurfaceFlinger::defaultCompositionDataspace = Dataspace::V0_SRGB;

ui::PixelFormat SurfaceFlinger::defaultCompositionPixelFormat = ui::PixelFormat::RGBA_8888;
@@ -364,11 +363,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    maxGraphicsHeight = std::max(max_graphics_height(0), 0);



    hasWideColorDisplay = has_wide_color_display(false);



    // Android 12 and beyond, color management in display pipeline is turned on

    // by default.

    useColorManagement = use_color_management(true);



    mDefaultCompositionDataspace =

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

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

services/surfaceflinger/SurfaceFlinger.h

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public: 
    static ui::Rotation internalDisplayOrientation;



    // Indicate if device wants color management on its display.

    static bool useColorManagement;

    static const constexpr bool useColorManagement = true;



    static bool useContextPriority;

services/surfaceflinger/SurfaceFlingerProperties.cpp

+0 −11
Original line number Diff line number Diff line
@@ -195,17 +195,6 @@ SurfaceFlingerProperties::primary_display_orientation_values primary_display_ori 
    return SurfaceFlingerProperties::primary_display_orientation_values::ORIENTATION_0;

}



bool use_color_management(bool defaultValue) {

    auto tmpuseColorManagement = SurfaceFlingerProperties::use_color_management();

    auto tmpHasHDRDisplayVal = has_HDR_display(defaultValue);

    auto tmpHasWideColorDisplayVal = has_wide_color_display(defaultValue);



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

        defaultValue;



    return tmpuseColorManagementVal || tmpHasHDRDisplayVal || tmpHasWideColorDisplayVal;

}



int64_t default_composition_dataspace(Dataspace defaultValue) {

    auto temp = SurfaceFlingerProperties::default_composition_dataspace();

    if (temp.has_value()) {

services/surfaceflinger/SurfaceFlingerProperties.h

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ bool start_graphics_allocator_service(bool defaultValue); 
SurfaceFlingerProperties::primary_display_orientation_values primary_display_orientation(

        SurfaceFlingerProperties::primary_display_orientation_values defaultValue);



bool use_color_management(bool defaultValue);



int64_t default_composition_dataspace(

        android::hardware::graphics::common::V1_2::Dataspace defaultValue);

services/surfaceflinger/tests/unittests/DisplayTransactionTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ DisplayTransactionTest::DisplayTransactionTest() { 


    // Default to no wide color display support configured

    mFlinger.mutableHasWideColorDisplay() = false;

    mFlinger.mutableUseColorManagement() = false;

    mFlinger.mutableDisplayColorSetting() = DisplayColorSetting::kUnmanaged;



    mFlinger.setCreateBufferQueueFunction([](auto, auto, auto) {