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

Commit 2baebf93 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Asserting flashing plan is used in do_flash" into main am: e1a473cd am: 18fab082 

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



Change-Id: I7d7f42c90e5675071d9720b92218e878c0e20469
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0993dbd5 18fab082

fastboot/fastboot.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -1489,10 +1489,13 @@ static std::string repack_ramdisk(const char* pname, struct fastboot_buffer* buf 




void do_flash(const char* pname, const char* fname, const bool apply_vbmeta,

void do_flash(const char* pname, const char* fname, const bool apply_vbmeta,

              const FlashingPlan* fp) {

              const FlashingPlan* fp) {

    if (!fp) {

        die("do flash was called without a valid flashing plan");

    }

    verbose("Do flash %s %s", pname, fname);

    verbose("Do flash %s %s", pname, fname);

    struct fastboot_buffer buf;

    struct fastboot_buffer buf;





    if (fp && fp->source) {

    if (fp->source) {

        unique_fd fd = fp->source->OpenFile(fname);

        unique_fd fd = fp->source->OpenFile(fname);

        if (fd < 0 || !load_buf_fd(std::move(fd), &buf, fp)) {

        if (fd < 0 || !load_buf_fd(std::move(fd), &buf, fp)) {

            die("could not load '%s': %s", fname, strerror(errno));

            die("could not load '%s': %s", fname, strerror(errno));