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

Commit 9cd5e531 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "fastboot: Don't give parsing error for unsupported 'getvar... 

Merge "fastboot: Don't give parsing error for unsupported 'getvar erase-block-size'." am: e5ff9b98
am: 5cea27ba

Change-Id: Ia4626f4f1df1be9b3fc403f7f45e5398fae8e269
parents 7ed0b9cc 5cea27ba

fastboot/fastboot.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,7 @@ static std::string fb_fix_numeric_var(std::string var) { 


static unsigned fb_get_flash_block_size(Transport* transport, std::string name) {

    std::string sizeString;

    if (!fb_getvar(transport, name.c_str(), &sizeString)) {

    if (!fb_getvar(transport, name.c_str(), &sizeString) || sizeString.empty()) {

        /* This device does not report flash block sizes, so return 0 */

        return 0;

    }