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

Commit 58c9fb11 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: cleanup flag vsync_predictor_recovery" into main

parents adb88a43 a0afa83d

services/surfaceflinger/Scheduler/VSyncPredictor.cpp

+1 −2
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ bool VSyncPredictor::addVsyncTimestamp(nsecs_t timestamp) { 
    // Calculated slope over the period of time can become outdated as the new timestamps are

    // stored. Using idealPeriod instead provides a rate which is valid at all the times.

    auto const currentPeriod = mDisplayModePtr->getVrrConfig() &&

                    (FlagManager::getInstance().vsync_predictor_recovery() ||

                     FlagManager::getInstance().vsync_predictor_predicts_within_threshold())

                    (FlagManager::getInstance().vsync_predictor_predicts_within_threshold())

            ? idealPeriod()

            : it->second.slope;

services/surfaceflinger/common/FlagManager.cpp

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

    DUMP_ACONFIG_FLAG(vsync_predictor_rate_change_with_aligned_sequence);

    DUMP_ACONFIG_FLAG(unify_refresh_rate_callbacks);

    DUMP_ACONFIG_FLAG(vsync_predictor_recovery);

    DUMP_ACONFIG_FLAG(vsync_predictor_predicts_within_threshold);



    /// Trunk stable readonly flags ///
@@ -302,7 +301,6 @@ FLAG_MANAGER_ACONFIG_FLAG(resync_on_tx, ""); 
FLAG_MANAGER_ACONFIG_FLAG(reset_model_flushes_fence, "");

FLAG_MANAGER_ACONFIG_FLAG(vsync_predictor_rate_change_with_aligned_sequence, "")

FLAG_MANAGER_ACONFIG_FLAG(unify_refresh_rate_callbacks, "");

FLAG_MANAGER_ACONFIG_FLAG(vsync_predictor_recovery, "");

FLAG_MANAGER_ACONFIG_FLAG(vsync_predictor_predicts_within_threshold, "");



/// Trunk stable server (R/W) flags from outside SurfaceFlinger ///

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

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

    bool vsync_predictor_rate_change_with_aligned_sequence() const;

    bool unify_refresh_rate_callbacks() const;

    bool vsync_predictor_recovery() const;

    bool vsync_predictor_predicts_within_threshold() const;



    /// Trunk stable readonly flags ///

services/surfaceflinger/surfaceflinger_flags_new.aconfig

+0 −10
Original line number Diff line number Diff line
@@ -348,16 +348,6 @@ flag { 
  }

} # vsync_predictor_rate_change_with_aligned_sequence



flag {

  name: "vsync_predictor_recovery"

  namespace: "core_graphics"

  description: "Recover the vsync predictor from bad vsync model"

  bug: "385059265"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

 } # vsync_predictor_recovery



flag {

  name: "vsync_predictor_predicts_within_threshold"

  namespace: "core_graphics"