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

Commit 205a5ad8 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[cleanup] add_sf_skipped_frames_to_trace flag clean up" into main

parents 7dfd5448 65894200

services/surfaceflinger/FrameTimeline/FrameTimeline.cpp

+2 −4
Original line number Diff line number Diff line
@@ -1398,10 +1398,8 @@ nsecs_t FrameTimeline::DisplayFrame::trace(pid_t surfaceFlingerPid, nsecs_t mono 
        surfaceFrame->trace(mToken, monoBootOffset, filterFramesBeforeTraceStarts);

    }



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

    addSkippedFrame(surfaceFlingerPid, monoBootOffset, previousPredictionPresentTime,

                    filterFramesBeforeTraceStarts);

    }

    return mSurfaceFlingerPredictions.presentTime;

}

services/surfaceflinger/common/FlagManager.cpp

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


    /// Trunk stable readonly flags ///

    /// IMPORTANT - please keep alphabetize to reduce merge conflicts

    DUMP_ACONFIG_FLAG(add_sf_skipped_frames_to_trace);

    DUMP_ACONFIG_FLAG(adpf_fmq_sf);

    DUMP_ACONFIG_FLAG(allow_n_vsyncs_in_targeter);

    DUMP_ACONFIG_FLAG(arr_setframerate_gte_enum);
@@ -261,7 +260,6 @@ FLAG_MANAGER_ACONFIG_FLAG(misc1, "") 
FLAG_MANAGER_ACONFIG_FLAG(vrr_config, "debug.sf.enable_vrr_config")

FLAG_MANAGER_ACONFIG_FLAG(hdcp_level_hal, "")

FLAG_MANAGER_ACONFIG_FLAG(hdcp_negotiation, "debug.sf.hdcp_negotiation");

FLAG_MANAGER_ACONFIG_FLAG(add_sf_skipped_frames_to_trace, "")

FLAG_MANAGER_ACONFIG_FLAG(use_known_refresh_rate_for_fps_consistency, "")

FLAG_MANAGER_ACONFIG_FLAG(cache_when_source_crop_layer_only_moved,

                          "debug.sf.cache_source_crop_only_moved")

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

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ public: 


    /// Trunk stable readonly flags ///

    /// IMPORTANT - please keep alphabetize to reduce merge conflicts

    bool add_sf_skipped_frames_to_trace() const;

    bool adpf_fmq_sf() const;

    bool allow_n_vsyncs_in_targeter() const;

    bool arr_setframerate_gte_enum() const;

services/surfaceflinger/surfaceflinger_flags.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -71,14 +71,6 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "add_sf_skipped_frames_to_trace"

  namespace: "core_graphics"

  description: "Add SurfaceFlinger dropped Frames to frame timeline"

  bug: "273701290"

  is_fixed_read_only: true

}



# This file is locked and should not be changed. Use surfaceflinger_flags_new.aconfig



flag {

services/surfaceflinger/tests/unittests/FlagManagerTest.cpp

+0 −9
Original line number Diff line number Diff line
@@ -99,15 +99,6 @@ TEST_F(FlagManagerTest, returnsOverrideTrue) { 
    EXPECT_TRUE(mFlagManager.refresh_rate_overlay_on_external_display());

}



TEST_F(FlagManagerTest, returnsOverrideReadonly) {

    SET_FLAG_FOR_TEST(flags::add_sf_skipped_frames_to_trace, false);



    // This is stored in a static variable, so this test depends on the fact

    // that this flag has not been read in this process.

    EXPECT_CALL(mFlagManager, getBoolProperty).WillOnce(Return(true));

    EXPECT_TRUE(mFlagManager.add_sf_skipped_frames_to_trace());

}



// disabling this test since we need to use a unique flag for this test,

// but we only one server flag currently. Re-enable once we have a new flag

// and change this test to use a unique flag.