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

Merge changes from topic "fastboot_version"

Browse source 
* changes:
  Adding fastboot-info version to host tool
  Updating fastboot-info version check
This commit is contained in:
Daniel Zheng 2023-05-04 17:49:07 +00:00 • committed by Gerrit Code Review
commit d7150ea505
3 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fastboot/fastboot.cpp
View file

@ -95,6 +95,8 @@ using android::base::unique_fd;
using namespace std::string_literals;
using namespace std::placeholders;
#define FASTBOOT_INFO_VERSION 1
static const char* serial = nullptr;
static bool g_long_listing = false;
@ -1663,20 +1665,6 @@ void AddResizeTasks(const FlashingPlan* fp, std::vector<std::unique_ptr<Task>>*
return;
}
static bool IsNumber(const std::string& s) {
bool period = false;
for (size_t i = 0; i < s.length(); i++) {
if (!isdigit(s[i])) {
if (!period && s[i] == '.' && i != 0 && i != s.length() - 1) {
period = true;
} else {
return false;
}
}
}
return true;
}
static bool IsIgnore(const std::vector<std::string>& command) {
if (command[0][0] == '#') {
return true;
@ -1684,7 +1672,8 @@ static bool IsIgnore(const std::vector<std::string>& command) {
return false;
}
bool CheckFastbootInfoRequirements(const std::vector<std::string>& command) {
bool CheckFastbootInfoRequirements(const std::vector<std::string>& command,
uint32_t host_tool_version) {
if (command.size() != 2) {
LOG(ERROR) << "unknown characters in version info in fastboot-info.txt -> "
<< android::base::Join(command, " ");
@ -1696,18 +1685,20 @@ bool CheckFastbootInfoRequirements(const std::vector<std::string>& command) {
return false;
}
if (!IsNumber(command[1])) {
LOG(ERROR) << "version number contains non-numeric values in fastboot-info.txt -> "
uint32_t fastboot_info_version;
if (!android::base::ParseUint(command[1], &fastboot_info_version)) {
LOG(ERROR) << "version number contains non-numeric characters in fastboot-info.txt -> "
<< android::base::Join(command, " ");
return false;
}
LOG(VERBOSE) << "Checking 'fastboot-info.txt version'";
if (command[1] < PLATFORM_TOOLS_VERSION) {
if (fastboot_info_version <= host_tool_version) {
return true;
}
LOG(ERROR) << "fasboot-info.txt version: " << command[1]
<< " not compatible with host tool version --> " << PLATFORM_TOOLS_VERSION;
<< " not compatible with host tool version --> " << host_tool_version;
return false;
}
@ -1721,7 +1712,7 @@ std::vector<std::unique_ptr<Task>> ParseFastbootInfo(const FlashingPlan* fp,
continue;
}
if (command.size() > 1 && command[0] == "version") {
if (!CheckFastbootInfoRequirements(command)) {
if (!CheckFastbootInfoRequirements(command, FASTBOOT_INFO_VERSION)) {
return {};
}
continue;

3
fastboot/fastboot.h
View file

@ -133,7 +133,8 @@ void syntax_error(const char* fmt, ...);
std::string get_current_slot();
// Code for Parsing fastboot-info.txt
bool CheckFastbootInfoRequirements(const std::vector<std::string>& command);
bool CheckFastbootInfoRequirements(const std::vector<std::string>& command,
uint32_t host_tool_version);
std::unique_ptr<FlashTask> ParseFlashCommand(const FlashingPlan* fp,
const std::vector<std::string>& parts);
std::unique_ptr<RebootTask> ParseRebootCommand(const FlashingPlan* fp,

25
fastboot/task_test.cpp
View file

@ -89,20 +89,27 @@ TEST_F(ParseTest, CorrectFlashTaskFormed) {
}
TEST_F(ParseTest, VersionCheckCorrect) {
std::vector<std::string> correct_versions = {
"version 1.0",
"version 22.00",
};
std::vector<std::string> correct_versions = {"version 1", "version 22", "version 5",
"version 17"};
std::vector<std::string> bad_versions = {"version", "version .01", "version x1",
"version 1.0.1", "version 1.", "s 1.0",
"version 1.0 2.0"};
std::vector<std::string> bad_versions = {"version", "version .01", "version x1",
"version 1.0.1", "version 1.", "s 1.0",
"version 1.0 2.0", "version 100.00", "version 1 2"};
for (auto& version : correct_versions) {
ASSERT_TRUE(CheckFastbootInfoRequirements(android::base::Split(version, " "))) << version;
ASSERT_TRUE(CheckFastbootInfoRequirements(android::base::Split(version, " "), 26))
<< version;
}
// returning False for failing version check
for (auto& version : correct_versions) {
ASSERT_FALSE(CheckFastbootInfoRequirements(android::base::Split(version, " "), 0))
<< version;
}
// returning False for bad format
for (auto& version : bad_versions) {
ASSERT_FALSE(CheckFastbootInfoRequirements(android::base::Split(version, " "))) << version;
ASSERT_FALSE(CheckFastbootInfoRequirements(android::base::Split(version, " "), 100))
<< version;
}
}