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

Commit bb7cabfd authored by Mariia Sandrikova's avatar Mariia Sandrikova
Browse files

DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..." 

Clean up debug.sf.ignore_hwc_physical_display_orientation

Temporary property was introduced in Iffbdc13149f517f0b59b313f1fe1f7900cc8597e

Test: manual
Bug: 246793311

Revert submission 20920163-revert-20881991-clean-up-temp-sysprop-FZOZHLNEBL

Reason for revert: Revert a revert of I000feb9e54a9f3b897eb4867fb285788cdb2fc46 to land it again

Reverted changes: /q/submissionid:20920163-revert-20881991-clean-up-temp-sysprop-FZOZHLNEBL

Change-Id: I1ac24f72b7bbdf1e82a7c840e800faed13aa2c1e
parent 7b31cca0

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();