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

Commit 7e7f072d authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Removing local image lookup from load_buf" am: 77ac76c0 am: 0a2c44f5 

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



Change-Id: Ibcad1ceef6ce7c6bfe535d7847273c5c4984f046
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02ae8c72 0a2c44f5

fastboot/fastboot.cpp

+1 −3
Original line number Original line Diff line number Diff line
@@ -1076,9 +1076,7 @@ static bool load_buf(const char* fname, struct fastboot_buffer* buf) { 
    unique_fd fd(TEMP_FAILURE_RETRY(open(fname, O_RDONLY | O_BINARY)));

    unique_fd fd(TEMP_FAILURE_RETRY(open(fname, O_RDONLY | O_BINARY)));





    if (fd == -1) {

    if (fd == -1) {

        auto path = find_item_given_name(fname);

        return false;

        fd = unique_fd(TEMP_FAILURE_RETRY(open(path.c_str(), O_RDONLY | O_BINARY)));

        if (fd == -1) return false;

    }

    }





    struct stat s;

    struct stat s;