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

Merge "Return partition size in hex format."

Browse source
This commit is contained in:
Treehugger Robot 2018-10-09 21:38:48 +00:00 • committed by Gerrit Code Review
commit b2263b4a07
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/device/variables.cpp
View file

@ -288,7 +288,7 @@ bool GetPartitionSize(FastbootDevice* device, const std::vector<std::string>& ar
bool is_zero_length;
if (LogicalPartitionExists(args[0], device->GetCurrentSlot(), &is_zero_length) &&
is_zero_length) {
*message = "0";
*message = "0x0";
return true;
}
// Otherwise, open the partition as normal.

6
fastboot/fuzzy_fastboot/main.cpp
View file

@ -43,6 +43,7 @@
#include <thread>
#include <vector>
#include <android-base/parseint.h>
#include <android-base/stringprintf.h>
#include <gtest/gtest.h>
#include <sparse/sparse.h>
@ -331,8 +332,9 @@ TEST_F(Conformance, PartitionInfo) {
<< cmd + " responded with a string with leading whitespace";
EXPECT_FALSE(resp.compare(0, 2, "0x"))
<< cmd + "responded with a string that does not start with 0x...";
int64_t size = strtoll(resp.c_str(), nullptr, 16);
EXPECT_GT(size, 0) << "'" + resp + "' is not a valid response from " + cmd;
uint64_t size;
ASSERT_TRUE(android::base::ParseUint(resp, &size))
<< "'" + resp + "' is not a valid response from " + cmd;
}
}