Merge "SF FlagManager: ignore debug override during tests" into main (d28755ab) · Commits · e / os / android_frameworks_native

services/surfaceflinger/common/FlagManager.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -160,15 +160,13 @@ bool FlagManager::getServerConfigurableFlag(const char* experimentFlagName) cons
		"Can't read %s before boot completed as it is server writable", \
		__func__); \
		} \
		static std::optional<bool> debugOverride = getBoolProperty(syspropOverride); \
		static bool value = getFlagValue([] { return flags::name(); }, debugOverride); \
		static const std::optional<bool> debugOverride = getBoolProperty(syspropOverride); \
		static const bool value = getFlagValue([] { return flags::name(); }, debugOverride); \
		if (mUnitTestMode) { \
		/* \
		* When testing, we don't want to rely on the cached values stored in the static \
		* variables. \
		* When testing, we don't want to rely on the cached `value` or the debugOverride. \
		*/ \
		debugOverride = getBoolProperty(syspropOverride); \
		value = getFlagValue([] { return flags::name(); }, debugOverride); \
		return flags::name(); \
		} \
		return value; \
		}

services/surfaceflinger/tests/unittests/FlagManagerTest.cpp

+44 −23

Original line number	Diff line number	Diff line
		@@ -89,18 +89,53 @@ TEST_F(FlagManagerTest, creashesIfQueriedBeforeBoot) {
		EXPECT_DEATH(FlagManager::getInstance().late_boot_misc2(), "");
		}

		TEST_F(FlagManagerTest, returnsOverride) {
		mFlagManager.setUnitTestMode();
		TEST_F(FlagManagerTest, returnsOverrideTrue) {
		mFlagManager.markBootCompleted();

		// Twice, since the first call is to initialize the static variable
		EXPECT_CALL(mFlagManager, getBoolProperty)
		.Times((2))
		.WillOnce(Return(true))
		.WillOnce(Return(true));
		EXPECT_EQ(true, mFlagManager.late_boot_misc2());
		SET_FLAG_FOR_TEST(com::android::graphics::surfaceflinger::flags::late_boot_misc2, 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.late_boot_misc2());

		// Further calls will not result in further calls to getBoolProperty.
		EXPECT_TRUE(mFlagManager.late_boot_misc2());
		}

		TEST_F(FlagManagerTest, returnsOverrideReadonly) {
		SET_FLAG_FOR_TEST(com::android::graphics::surfaceflinger::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());
		}

		TEST_F(FlagManagerTest, returnsOverrideFalse) {
		mFlagManager.markBootCompleted();

		SET_FLAG_FOR_TEST(com::android::graphics::surfaceflinger::flags::
		refresh_rate_overlay_on_external_display,
		true);

		// 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(false));
		EXPECT_EQ(false, mFlagManager.late_boot_misc2());
		EXPECT_FALSE(mFlagManager.refresh_rate_overlay_on_external_display());
		}

		TEST_F(FlagManagerTest, ignoresOverrideInUnitTestMode) {
		mFlagManager.setUnitTestMode();

		SET_FLAG_FOR_TEST(com::android::graphics::surfaceflinger::flags::multithreaded_present, true);

		// If this has not been called in this process, it will be called.
		// Regardless, the result is ignored.
		EXPECT_CALL(mFlagManager, getBoolProperty).WillRepeatedly(Return(false));

		EXPECT_EQ(true, mFlagManager.multithreaded_present());
		}

		TEST_F(FlagManagerTest, returnsValue) {
		@@ -119,20 +154,6 @@ TEST_F(FlagManagerTest, returnsValue) {
		}
		}

		TEST_F(FlagManagerTest, readonlyReturnsOverride) {
		mFlagManager.setUnitTestMode();

		// Twice, since the first call is to initialize the static variable
		EXPECT_CALL(mFlagManager, getBoolProperty)
		.Times(2)
		.WillOnce(Return(true))
		.WillOnce(Return(true));
		EXPECT_EQ(true, mFlagManager.misc1());

		EXPECT_CALL(mFlagManager, getBoolProperty).WillOnce(Return(false));
		EXPECT_EQ(false, mFlagManager.misc1());
		}

		TEST_F(FlagManagerTest, readonlyReturnsValue) {
		mFlagManager.setUnitTestMode();