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

Commit 7838f358 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Removed hardcoded check to copy AVB Footer" am: 51a36614 am: 46199324 

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



Change-Id: I7cc3949eaf8ebbaab9ed3588fa1421f8a6967c9a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 688a9ca0 46199324

fastboot/fastboot.cpp

+2 −7
Original line number Diff line number Diff line
@@ -1202,10 +1202,9 @@ static uint64_t get_partition_size(const std::string& partition) { 
}



static void copy_avb_footer(const std::string& partition, struct fastboot_buffer* buf) {

    if (buf->sz < AVB_FOOTER_SIZE) {

    if (buf->sz < AVB_FOOTER_SIZE || is_logical(partition)) {

        return;

    }



    // If overflows and negative, it should be < buf->sz.

    int64_t partition_size = static_cast<int64_t>(get_partition_size(partition));
@@ -1259,11 +1258,7 @@ void flash_partition_files(const std::string& partition, const std::vector<Spars 


static void flash_buf(const std::string& partition, struct fastboot_buffer* buf,

                      const bool apply_vbmeta) {

    if (partition == "boot" || partition == "boot_a" || partition == "boot_b" ||

        partition == "init_boot" || partition == "init_boot_a" || partition == "init_boot_b" ||

        partition == "recovery" || partition == "recovery_a" || partition == "recovery_b") {

    copy_avb_footer(partition, buf);

    }



    // Rewrite vbmeta if that's what we're flashing and modification has been requested.

    if (g_disable_verity || g_disable_verification) {