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

Commit 54dde948 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: flag cleanup" into main

parents caf47f37 f7b0b914

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+2 −7
Original line number Diff line number Diff line
@@ -636,10 +636,7 @@ bool RequestedLayerState::isSimpleBufferUpdate(const layer_state_t& s) const { 
    const uint64_t deniedFlags = layer_state_t::eProducerDisconnect | layer_state_t::eLayerChanged |

            layer_state_t::eRelativeLayerChanged | layer_state_t::eTransparentRegionChanged |

            layer_state_t::eBlurRegionsChanged | layer_state_t::eLayerStackChanged |

            layer_state_t::eReparent |

            (FlagManager::getInstance().latch_unsignaled_with_auto_refresh_changed()

                     ? 0

                     : (layer_state_t::eAutoRefreshChanged | layer_state_t::eFlagsChanged));

            layer_state_t::eReparent;

    if (s.what & deniedFlags) {

        SFTRACE_FORMAT_INSTANT("%s: false [has denied flags 0x%" PRIx64 "]", __func__,

                               s.what & deniedFlags);
@@ -662,9 +659,7 @@ bool RequestedLayerState::isSimpleBufferUpdate(const layer_state_t& s) const { 
            layer_state_t::eDestinationFrameChanged | layer_state_t::eDimmingEnabledChanged |

            layer_state_t::eExtendedRangeBrightnessChanged |

            layer_state_t::eDesiredHdrHeadroomChanged | layer_state_t::eLutsChanged |

            (FlagManager::getInstance().latch_unsignaled_with_auto_refresh_changed()

                     ? layer_state_t::eFlagsChanged

                     : 0);

            layer_state_t::eFlagsChanged;

    if (changedFlags & deniedChanges) {

        SFTRACE_FORMAT_INSTANT("%s: false [has denied changes flags 0x%" PRIx64 "]", __func__,

                               changedFlags & deniedChanges);

services/surfaceflinger/RefreshRateOverlay.cpp

+1 −2
Original line number Diff line number Diff line
@@ -288,8 +288,7 @@ void RefreshRateOverlay::onVrrIdle(bool idle) { 
}



void RefreshRateOverlay::changeRenderRate(Fps renderFps) {

    if (mFeatures.test(Features::RenderRate) && mRefreshRate &&

        FlagManager::getInstance().misc1()) {

    if (mFeatures.test(Features::RenderRate) && mRefreshRate) {

        mRenderFps = renderFps;

        const auto buffer = getOrCreateBuffers(*mRefreshRate, renderFps, mIsVrrIdle)[mFrame];

        createTransaction().setBuffer(mSurfaceControl->get(), buffer).apply();

services/surfaceflinger/Scheduler/EventThread.cpp

+1 −2
Original line number Diff line number Diff line
@@ -361,8 +361,7 @@ sp<EventThreadConnection> EventThread::createEventConnection( 
    auto connection = sp<EventThreadConnection>::make(const_cast<EventThread*>(this),

                                                      IPCThreadState::self()->getCallingUid(),

                                                      eventRegistration);

    if (FlagManager::getInstance().misc1() &&

        !FlagManager::getInstance().disable_sched_fifo_sf_sched()) {

    if (!FlagManager::getInstance().disable_sched_fifo_sf_sched()) {

        const int policy = SCHED_FIFO;

        connection->setMinSchedulerPolicy(policy, sched_get_priority_min(policy));

    }

services/surfaceflinger/Scheduler/LayerHistory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ namespace android::scheduler { 
namespace {



bool isLayerActive(const LayerInfo& info, nsecs_t threshold, bool isVrrDevice) {

    if (FlagManager::getInstance().misc1() && !info.isVisible()) {

    if (!info.isVisible()) {

        return false;

    }

services/surfaceflinger/Scheduler/Scheduler.cpp

+1 −5
Original line number Diff line number Diff line
@@ -91,11 +91,7 @@ void Scheduler::startTimers() { 
    using namespace sysprop;

    using namespace std::string_literals;



    const int32_t defaultTouchTimerValue =

            FlagManager::getInstance().enable_fro_dependent_features() &&

                    sysprop::enable_frame_rate_override(true)

            ? 200

            : 0;

    const int32_t defaultTouchTimerValue = sysprop::enable_frame_rate_override(true) ? 200 : 0;

    if (const int32_t millis = set_touch_timer_ms(defaultTouchTimerValue); millis > 0) {

        // Touch events are coming to SF every 100ms, so the timer needs to be higher than that

        mTouchTimer.emplace(