Merge "Increase zram size percentage limit" into main (fb954abe) · Commits · e / os / android_system_core

fs_mgr/libfstab/fstab.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ bool ParseFsMgrFlags(const std::string& flags, FstabEntry* entry) {
		if (!arg.empty() && arg.back() == '%') {
		arg.pop_back();
		int val;
		if (ParseInt(arg, &val, 0, 100)) {
		if (ParseInt(arg, &val, 0, 200)) {
		entry->zram_size = CalculateZramSize(val);
		} else {
		LWARNING << "Warning: zramsize= flag malformed: " << arg;

+7 −1

Original line number	Diff line number	Diff line
		@@ -710,6 +710,7 @@ source none2 swap defaults zramsize=blah%
		source none3 swap defaults zramsize=5%
		source none4 swap defaults zramsize=105%
		source none5 swap defaults zramsize=%
		source none6 swap defaults zramsize=210%
		)fs";
		ASSERT_TRUE(android::base::WriteStringToFile(fstab_contents, tf.path));

		@@ -742,12 +743,17 @@ source none5 swap defaults zramsize=%

		EXPECT_EQ("none4", entry->mount_point);
		EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));
		EXPECT_EQ(0, entry->zram_size);
		EXPECT_NE(0, entry->zram_size);
		entry++;

		EXPECT_EQ("none5", entry->mount_point);
		EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));
		EXPECT_EQ(0, entry->zram_size);
		entry++;

		EXPECT_EQ("none6", entry->mount_point);
		EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));
		EXPECT_EQ(0, entry->zram_size);
		}

		TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_FileEncryption) {