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

Commit 8d4e3376 authored by Mariia Sandrikova's avatar Mariia Sandrikova Committed by Automerger Merge Worker
Browse files

Merge "Clean up debug.sf.ignore_hwc_physical_display_orientation" into tm-qpr-dev am: 0130e8f3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20881991



Change-Id: I30c9aa0d32468048f74a684c4e53d39dc7b193ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6c392d4 0130e8f3

services/surfaceflinger/SurfaceFlinger.cpp

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

    property_get("debug.sf.treat_170m_as_sRGB", value, "0");

    mTreat170mAsSrgb = atoi(value);

    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

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

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

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

    // comes online to attempt to read the property. The property is

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

    if (!id) {

        return ui::ROTATION_0;

        return ui::ROTATION_0;

    }

    }

    if (!mIgnoreHwcPhysicalDisplayOrientation &&

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

        getHwComposer().getComposer()->isSupported(

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

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

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

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

            case Hwc2::AidlTransform::ROT_90:

            case Hwc2::AidlTransform::ROT_90:

services/surfaceflinger/SurfaceFlinger.h

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

    // on this behavior to increase contrast for some media sources.

    bool mTreat170mAsSrgb = false;

    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:

protected:

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

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

    virtual ~SurfaceFlinger();

    virtual ~SurfaceFlinger();