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

Commit e9e11dd2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fs_mgr_overlayfs: Revert to use /data only if VAB" am: f9ad5888 am: 0eefdad7 

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



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

fs_mgr/fs_mgr_overlayfs.cpp

+8 −8
Original line number Diff line number Diff line
@@ -1089,7 +1089,7 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi 
    return true;

}



static bool CanUseSuperPartition(const Fstab& fstab) {

static bool CanUseSuperPartition(const Fstab& fstab, bool* is_virtual_ab) {

    auto slot_number = fs_mgr_overlayfs_slot_number();

    auto super_device = fs_mgr_overlayfs_super_device(slot_number);

    if (!fs_mgr_rw_access(super_device) || !fs_mgr_overlayfs_has_logical(fstab)) {
@@ -1099,6 +1099,7 @@ static bool CanUseSuperPartition(const Fstab& fstab) { 
    if (!metadata) {

        return false;

    }

    *is_virtual_ab = !!(metadata->header.flags & LP_HEADER_FLAG_VIRTUAL_AB_DEVICE);

    return true;

}
@@ -1111,13 +1112,12 @@ bool fs_mgr_overlayfs_create_scratch(const Fstab& fstab, std::string* scratch_de 
        return *partition_exists;

    }



    // Try ImageManager on /data first.

    bool is_virtual_ab = false;

    if (CanUseSuperPartition(fstab, &is_virtual_ab)) {

        bool can_use_data = false;

    if (FilesystemHasReliablePinning("/data", &can_use_data) && can_use_data) {

        if (is_virtual_ab && FilesystemHasReliablePinning("/data", &can_use_data) && can_use_data) {

            return CreateScratchOnData(scratch_device, partition_exists);

        }

    // If that fails, see if we can land on super.

    if (CanUseSuperPartition(fstab)) {

        return CreateDynamicScratch(scratch_device, partition_exists);

    }

    return false;