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

Commit 517364d3 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes Ib5a63a7b,If00f581a am: 12e5f038 am: c913a478 

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

Change-Id: I2fbaca7f56a21e8991aa99d4c0675266bb3b81f8
parents fdb6f20e c913a478

fastboot/device/flashing.cpp

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ int Flash(FastbootDevice* device, const std::string& partition_name) { 
        return -EOVERFLOW;

    } else if (data.size() < block_device_size &&

               (partition_name == "boot" || partition_name == "boot_a" ||

                partition_name == "boot_b")) {

                partition_name == "boot_b" || partition_name == "init_boot" ||

                partition_name == "init_boot_a" || partition_name == "init_boot_b")) {

        CopyAVBFooter(&data, block_device_size);

    }

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

fastboot/fastboot.bash

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ _fastboot_cmd_flash() { 


    cur="${COMP_WORDS[COMP_CWORD]}"

    if [[ $i -eq $COMP_CWORD ]]; then

        partitions="boot bootloader dtbo modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm"

        partitions="boot bootloader dtbo init_boot modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm"

        COMPREPLY=( $(compgen -W "$partitions" -- $cur) )

    else

        _fastboot_util_complete_local_file "${cur}" '!*.img'

fastboot/fastboot.cpp

+6 −1
Original line number Diff line number Diff line
@@ -141,6 +141,10 @@ struct Image { 
static Image images[] = {

        // clang-format off

    { "boot",     "boot.img",         "boot.sig",     "boot",     false, ImageType::BootCritical },

    { "init_boot",

                  "init_boot.img",    "init_boot.sig",

                                                      "init_boot",

                                                                  false, ImageType::BootCritical },

    { nullptr,    "boot_other.img",   "boot.sig",     "boot",     true,  ImageType::Normal },

    { "cache",    "cache.img",        "cache.sig",    "cache",    true,  ImageType::Extra },

    { "dtbo",     "dtbo.img",         "dtbo.sig",     "dtbo",     true,  ImageType::BootCritical },
@@ -1072,7 +1076,8 @@ static void flash_buf(const std::string& partition, struct fastboot_buffer *buf) 
{

    sparse_file** s;



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

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

        partition == "init_boot" || partition == "init_boot_a" || partition == "init_boot_b") {

        copy_boot_avb_footer(partition, buf);

    }