ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Increase zram size percentage limit" into main am: fb954abea6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343241

Change-Id: If9ca6ab46167e7136995b011afe736cbeb7ccd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hung Nguyen 2024-11-08 05:35:57 +00:00 • committed by Automerger Merge Worker
commit f278c9ce19
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libfstab/fstab.cpp
View file

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

8
fs_mgr/tests/fs_mgr_test.cpp
View file

@ -710,6 +710,7 @@ source none2 swap defaults zramsize=blah%
source none3 swap defaults zramsize=5% source none3 swap defaults zramsize=5%
source none4 swap defaults zramsize=105% source none4 swap defaults zramsize=105%
source none5 swap defaults zramsize=% source none5 swap defaults zramsize=%
source none6 swap defaults zramsize=210%
)fs"; )fs";
ASSERT_TRUE(android::base::WriteStringToFile(fstab_contents, tf.path)); 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_EQ("none4", entry->mount_point);
EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags)); EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));
EXPECT_EQ(0, entry->zram_size); EXPECT_NE(0, entry->zram_size);
entry++; entry++;
EXPECT_EQ("none5", entry->mount_point); EXPECT_EQ("none5", entry->mount_point);
EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags)); EXPECT_TRUE(CompareFlags(flags, entry->fs_mgr_flags));
EXPECT_EQ(0, entry->zram_size); 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) { TEST(fs_mgr, ReadFstabFromFile_FsMgrOptions_FileEncryption) {