tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: don't require adb keys to be named "*.adb_key"."

Browse source
This commit is contained in:
Treehugger Robot 2016-12-15 06:04:04 +00:00 committed by Gerrit Code Review
commit 37883718a9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/adb_auth_host.cpp
View file

@ -207,11 +207,6 @@ static bool read_keys(const std::string& path, bool allow_dir = true) {
}
if (S_ISREG(st.st_mode)) {
if (!android::base::EndsWith(path, ".adb_key")) {
LOG(INFO) << "skipping non-adb_key '" << path << "'";
return false;
}
return read_key_file(path);
} else if (S_ISDIR(st.st_mode)) {
if (!allow_dir) {
@ -236,7 +231,12 @@ static bool read_keys(const std::string& path, bool allow_dir = true) {
continue;
}
result |= read_keys((path + OS_PATH_SEPARATOR + name).c_str(), false);
if (!android::base::EndsWith(name, ".adb_key")) {
LOG(INFO) << "skipping non-adb_key '" << path << "/" << name << "'";
continue;
}
result |= read_key_file((path + OS_PATH_SEPARATOR + name));
}
return result;
}