ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 5cea27baad

Change-Id: Ia4626f4f1df1be9b3fc403f7f45e5398fae8e269
This commit is contained in:
Tao Bao 2017-11-03 03:39:47 +00:00 • committed by android-build-merger
commit 9cd5e53128
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/fastboot.cpp
View file

@ -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;
}