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 "adb: don't require adb keys to be named "*.adb_key"." am: 37883718a9 

am: ffb0576c7b

Change-Id: I70b9a6ee90d57c8d4085f45bfc7ddf0e3cf711fa
This commit is contained in:
Josh Gao 2016-12-15 06:23:31 +00:00 committed by android-build-merger
parent f9351bf971 ffb0576c7b
commit 747049e527
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;
}