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

Commit 4ca547be authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Fix fastboot to cope with hammerhead\'s implicit hex." 

am: 2b7b3bd1

* commit '2b7b3bd1':
  Fix fastboot to cope with hammerhead's implicit hex.
parents aff48cbb 2b7b3bd1

fastboot/fastboot.cpp

+5 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ static struct sparse_file **load_sparse_files(int fd, int max_size) 


static int64_t get_target_sparse_limit(usb_handle* usb) {

    std::string max_download_size;

    if (!fb_getvar(usb, "max-download-size", &max_download_size)) {

    if (!fb_getvar(usb, "max-download-size", &max_download_size) || max_download_size.empty()) {

        fprintf(stderr, "target didn't report max-download-size\n");

        return 0;

    }
@@ -935,6 +935,10 @@ static void fb_perform_format(usb_handle* usb, 
        return;

    }



    // Some bootloaders (hammerhead, for example) use implicit hex.

    // This code used to use strtol with base 16.

    if (!android::base::StartsWith(partition_size, "0x")) partition_size = "0x" + partition_size;



    int64_t size;

    if (!android::base::ParseInt(partition_size.c_str(), &size)) {

        fprintf(stderr, "Couldn't parse partition size '%s'.\n", partition_size.c_str());