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

Merge "Fix "fastboot oem"."

Browse source
This commit is contained in:
Treehugger Robot 2017-05-11 23:40:58 +00:00 • committed by Gerrit Code Review
commit dbe9ab1074
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fastboot/fastboot.cpp
View file

@ -135,7 +135,7 @@ static std::string find_item_given_name(const char* img_name) {
return android::base::StringPrintf("%s/%s", dir, img_name); return android::base::StringPrintf("%s/%s", dir, img_name);
} }
std::string find_item(const std::string& item) { static std::string find_item(const std::string& item) {
for (size_t i = 0; i < arraysize(images); ++i) { for (size_t i = 0; i < arraysize(images); ++i) {
if (images[i].nickname && item == images[i].nickname) { if (images[i].nickname && item == images[i].nickname) {
return find_item_given_name(images[i].img_name); return find_item_given_name(images[i].img_name);
@ -1262,12 +1262,10 @@ static void do_bypass_unlock_command(std::vector<std::string>* args) {
static void do_oem_command(std::vector<std::string>* args) { static void do_oem_command(std::vector<std::string>* args) {
if (args->empty()) syntax_error("empty oem command"); if (args->empty()) syntax_error("empty oem command");
std::string command; std::string command("oem");
while (!args->empty()) { while (!args->empty()) {
if (!command.empty()) command += ' '; command += " " + next_arg(args);
command += next_arg(args);
} }
fb_queue_command(command.c_str(), ""); fb_queue_command(command.c_str(), "");
} }