commit a2c5f4add885376bb4d6e44d7be88970391e9456
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 05 01:39:15 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 05 01:39:15 2018 +0000
tree 61b9f5f42bd0fb12b1e1d97faee7721f630825ac
parent 0b63bde2c11151377a27bebbe06f85e90c96199f
parent 373542b98a479121d28fbb7ebba4236b182f5292

Merge "fastbootd: Fix partition size testing issues."

fastboot/device/variables.cpp

diff --git a/fastboot/device/variables.cpp b/fastboot/device/variables.cpp
index 9f3fa75..91e844a 100644
--- a/fastboot/device/variables.cpp
+++ b/fastboot/device/variables.cpp
@@ -191,7 +191,7 @@
         return false;
     }
     uint64_t size = get_block_device_size(handle.fd());
-    *message = android::base::StringPrintf("%" PRIX64, size);
+    *message = android::base::StringPrintf("0x%" PRIX64, size);
     return true;
 }
 

fastboot/fuzzy_fastboot/main.cpp

diff --git a/fastboot/fuzzy_fastboot/main.cpp b/fastboot/fuzzy_fastboot/main.cpp
index a7b22c6..dd64082 100644
--- a/fastboot/fuzzy_fastboot/main.cpp
+++ b/fastboot/fuzzy_fastboot/main.cpp
@@ -310,7 +310,7 @@
             << "getvar:all did not report any partition-size: through INFO responses";
     std::set<std::string> allowed{"ext4", "f2fs", "raw"};
     for (const auto p : parts) {
-        EXPECT_GT(std::get<1>(p), 0);
+        EXPECT_GE(std::get<1>(p), 0);
         std::string part(std::get<0>(p));
         std::set<std::string> allowed{"ext4", "f2fs", "raw"};
         std::string resp;