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

Commit d945cacb authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5667727 from 2c97ca4f to qt-qpr1-release 

Change-Id: I6559c6ccc50d0050a901cfbf4ff1a94f9e8ef53b
parents 52403b95 2c97ca4f

services/surfaceflinger/Scheduler/DispSync.cpp

+0 −11
Original line number Diff line number Diff line
@@ -288,17 +288,6 @@ public: 
                // new offset to allow for a seamless offset change without double-firing or

                // skipping.

                nsecs_t diff = oldPhase - phase;

                if (diff > mPeriod / 2) {

                    diff -= mPeriod;

                } else if (diff < -mPeriod / 2) {

                    diff += mPeriod;

                }



                if (phase < 0 && oldPhase > 0) {

                    diff += mPeriod;

                } else if (phase > 0 && oldPhase < 0) {

                    diff -= mPeriod;

                }

                eventListener.mLastEventTime -= diff;

                eventListener.mLastCallbackTime -= diff;

                mCond.signal();

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;

}