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

Commit 9e57695b authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7557463 from c2159564 to sc-v2-release 

Change-Id: I3ad74e047557687bd2b6d071974c7ba647132428
parents 410620e2 c2159564

libs/renderengine/skia/filters/BlurFilter.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ public: 
    static constexpr uint32_t kMaxPasses = 4;

    // To avoid downscaling artifacts, we interpolate the blurred fbo with the full composited

    // image, up to this radius.

    static constexpr float kMaxCrossFadeRadius = 30.0f;

    static constexpr float kMaxCrossFadeRadius = 10.0f;



    explicit BlurFilter();

    virtual ~BlurFilter(){};

services/surfaceflinger/SurfaceFlinger.cpp

+14 −6
Original line number Diff line number Diff line
@@ -1157,6 +1157,12 @@ void SurfaceFlinger::setActiveModeInternal() { 
    }



    const auto upcomingModeInfo = MAIN_THREAD_GUARD(display->getUpcomingActiveMode());

    if (!upcomingModeInfo.mode) {

        // There is no pending mode change. This can happen if the active

        // display changed and the mode change happened on a different display.

        return;

    }



    if (display->getActiveMode()->getSize() != upcomingModeInfo.mode->getSize()) {

        auto& state = mCurrentState.displays.editValueFor(display->getDisplayToken());

        // We need to generate new sequenceId in order to recreate the display (and this
@@ -1707,10 +1713,10 @@ void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t t 
    ATRACE_CALL();



    Mutex::Autolock lock(mStateLock);



    if (const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId)) {

        auto token = getPhysicalDisplayTokenLocked(*displayId);

        auto display = getDisplayDeviceLocked(token);

    const auto displayId = getHwComposer().toPhysicalDisplayId(hwcDisplayId);

    if (displayId) {

        const auto token = getPhysicalDisplayTokenLocked(*displayId);

        const auto display = getDisplayDeviceLocked(token);

        display->onVsync(timestamp);

    }
@@ -1718,8 +1724,10 @@ void SurfaceFlinger::onComposerHalVsync(hal::HWDisplayId hwcDisplayId, int64_t t 
        return;

    }



    if (hwcDisplayId != getHwComposer().getInternalHwcDisplayId()) {

        // For now, we don't do anything with external display vsyncs.

    const bool isActiveDisplay =

            displayId && getPhysicalDisplayTokenLocked(*displayId) == mActiveDisplayToken;

    if (!isActiveDisplay) {

        // For now, we don't do anything with non active display vsyncs.

        return;

    }