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

Commit 12d9188d authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr_overlayfs: Add scratch size override system property" am:... 

Merge "fs_mgr_overlayfs: Add scratch size override system property" am: e7f5532e am: 784b56c4 am: ed6c8d9f

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



Change-Id: I8e32d94a82f9e7735af49f3f76bbf1d4c835ff19
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d7e38e5 ed6c8d9f

fs_mgr/fs_mgr_overlayfs.cpp

+6 −1
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ using android::fiemap::IImageManager; 


namespace {



constexpr char kDataScratchSizeMbProp[] = "fs_mgr.overlayfs.data_scratch_size_mb";



bool fs_mgr_access(const std::string& path) {

    return access(path.c_str(), F_OK) == 0;

}
@@ -1084,7 +1086,10 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi 
        return false;

    }

    if (!images->BackingImageExists(partition_name)) {

        uint64_t size = GetIdealDataScratchSize();

        auto size = android::base::GetUintProperty<uint64_t>(kDataScratchSizeMbProp, 0) * 1_MiB;

        if (!size) {

            size = GetIdealDataScratchSize();

        }

        if (!size) {

            size = 2_GiB;

        }