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

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

Merge "[SF] Cleanup flag vrr_bugfix_dropped_frame" into main

parents cb8b75ab 233ae092

services/surfaceflinger/Scheduler/Scheduler.cpp

+1 −5
Original line number Diff line number Diff line
@@ -1194,10 +1194,6 @@ auto Scheduler::applyPolicy(S Policy::*statePtr, T&& newState) -> GlobalSignals 
                                                                     .shouldEmitEvent()});

        }



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

            frameRateOverridesChanged =

                    updateFrameRateOverridesLocked(consideredSignals, modeOpt->fps);

        }

        if (mPolicy.modeOpt != modeOpt) {

            mPolicy.modeOpt = modeOpt;

            refreshRateChanged = true;
@@ -1211,7 +1207,7 @@ auto Scheduler::applyPolicy(S Policy::*statePtr, T&& newState) -> GlobalSignals 
        mSchedulerCallback.requestDisplayModes(std::move(modeRequests));

    }



    if (FlagManager::getInstance().vrr_bugfix_dropped_frame()) {

    {

        std::scoped_lock lock(mPolicyLock);

        frameRateOverridesChanged =

                updateFrameRateOverridesLocked(consideredSignals, mPolicy.modeOpt->fps);

services/surfaceflinger/common/FlagManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ void FlagManager::dump(std::string& result) const { 
    DUMP_ACONFIG_FLAG(trace_frame_rate_override);

    DUMP_ACONFIG_FLAG(true_hdr_screenshots);

    DUMP_ACONFIG_FLAG(use_known_refresh_rate_for_fps_consistency);

    DUMP_ACONFIG_FLAG(vrr_bugfix_dropped_frame);

    DUMP_ACONFIG_FLAG(vrr_config);

    DUMP_ACONFIG_FLAG(vulkan_renderengine);

    DUMP_ACONFIG_FLAG(window_blur_kawase2);
@@ -275,7 +274,6 @@ FLAG_MANAGER_ACONFIG_FLAG(restore_blur_step, "debug.renderengine.restore_blur_st 
FLAG_MANAGER_ACONFIG_FLAG(dont_skip_on_early_ro, "")

FLAG_MANAGER_ACONFIG_FLAG(no_vsyncs_on_screen_off, "debug.sf.no_vsyncs_on_screen_off")

FLAG_MANAGER_ACONFIG_FLAG(protected_if_client, "")

FLAG_MANAGER_ACONFIG_FLAG(vrr_bugfix_dropped_frame, "")

FLAG_MANAGER_ACONFIG_FLAG(graphite_renderengine, "debug.renderengine.graphite")

FLAG_MANAGER_ACONFIG_FLAG(filter_frames_before_trace_starts, "")

FLAG_MANAGER_ACONFIG_FLAG(latch_unsignaled_with_auto_refresh_changed, "");

services/surfaceflinger/common/include/common/FlagManager.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ public: 
    bool trace_frame_rate_override() const;

    bool true_hdr_screenshots() const;

    bool use_known_refresh_rate_for_fps_consistency() const;

    bool vrr_bugfix_dropped_frame() const;

    bool vrr_config() const;

    bool vulkan_renderengine() const;

    bool window_blur_kawase2() const;

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -317,17 +317,6 @@ flag { 
  }

} # override_trusted_overlay



flag {

  name: "vrr_bugfix_dropped_frame"

  namespace: "core_graphics"

  description: "bug fix for VRR dropped frame"

  bug: "343603085"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

} # vrr_bugfix_dropped_frame



flag {

  name: "vsync_predictor_recovery"

  namespace: "core_graphics"