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

Commit 0b14b022 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Unable to mount filesystem in fastbootd mode on the user build." am: 7723c72c 

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

Change-Id: I1093e922d7251b9a30bc5b450f1ed924892f5cac
parents 7e2a6bf3 7723c72c

fastboot/device/flashing.cpp

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <android-base/file.h>

#include <android-base/logging.h>

#include <android-base/properties.h>

#include <android-base/strings.h>

#include <ext4_utils/ext4_utils.h>

#include <fs_mgr_overlayfs.h>
@@ -162,7 +163,9 @@ int Flash(FastbootDevice* device, const std::string& partition_name) { 
                partition_name == "boot_b")) {

        CopyAVBFooter(&data, block_device_size);

    }

    if (android::base::GetProperty("ro.system.build.type", "") != "user") {

        WipeOverlayfsForPartition(device, partition_name);

    }

    int result = FlashBlockDevice(handle.fd(), data);

    sync();

    return result;