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

Commit d6843664 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Revert "Revert "Clean up... 

Merge "DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..."" into tm-qpr-dev
parents ca9671d5 bb7cabfd

services/surfaceflinger/SurfaceFlinger.cpp

+1 −5
Original line number Diff line number Diff line
@@ -422,9 +422,6 @@ SurfaceFlinger::SurfaceFlinger(Factory& factory) : SurfaceFlinger(factory, SkipI 
    property_get("debug.sf.treat_170m_as_sRGB", value, "0");

    mTreat170mAsSrgb = atoi(value);



    mIgnoreHwcPhysicalDisplayOrientation =

            base::GetBoolProperty("debug.sf.ignore_hwc_physical_display_orientation"s, false);



    // We should be reading 'persist.sys.sf.color_saturation' here

    // but since /data may be encrypted, we need to wait until after vold

    // comes online to attempt to read the property. The property is
@@ -2404,8 +2401,7 @@ ui::Rotation SurfaceFlinger::getPhysicalDisplayOrientation(DisplayId displayId, 
    if (!id) {

        return ui::ROTATION_0;

    }

    if (!mIgnoreHwcPhysicalDisplayOrientation &&

        getHwComposer().getComposer()->isSupported(

    if (getHwComposer().getComposer()->isSupported(

                Hwc2::Composer::OptionalFeature::PhysicalDisplayOrientation)) {

        switch (getHwComposer().getPhysicalDisplayOrientation(*id)) {

            case Hwc2::AidlTransform::ROT_90:

services/surfaceflinger/SurfaceFlinger.h

+0 −5
Original line number Diff line number Diff line
@@ -353,11 +353,6 @@ public: 
    // on this behavior to increase contrast for some media sources.

    bool mTreat170mAsSrgb = false;



    // Allows to ignore physical orientation provided through hwc API in favour of

    // 'ro.surface_flinger.primary_display_orientation'.

    // TODO(b/246793311): Clean up a temporary property

    bool mIgnoreHwcPhysicalDisplayOrientation = false;



protected:

    // We're reference counted, never destroy SurfaceFlinger directly

    virtual ~SurfaceFlinger();