openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix "fastboot oem"." 

am: dbe9ab1074

Change-Id: I71c0d2eceaf4153f853196d07688558b3979a033
This commit is contained in:
Elliott Hughes 2017-05-12 00:42:37 +00:00 committed by android-build-merger
parent 1423041905 dbe9ab1074
commit c9d545855a
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);
}
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) {
if (images[i].nickname && item == images[i].nickname) {
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) {
if (args->empty()) syntax_error("empty oem command");
std::string command;
std::string command("oem");
while (!args->empty()) {
if (!command.empty()) command += ' ';
command += next_arg(args);
command += " " + next_arg(args);
}
fb_queue_command(command.c_str(), "");
}