commit e5e708bede851d6aafdea5fa8329e79908b78386
author Josh Gao <jmgao@google.com> Thu Dec 15 06:16:00 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 15 06:16:00 2016 +0000
tree 240d374a4b84aa902cd919dd491fe48037664c02
parent 7ed56500b31576d75400dafcf22cd311a05ebef0
parent e612ca2ab3a05195407cda23887843c3ee182e1d

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

Change-Id: I0a1463180019960e92fbd3c06befcdc3c182f261

adb/adb_auth_host.cpp

diff --git a/adb/adb_auth_host.cpp b/adb/adb_auth_host.cpp
index ff2d76d..ec9b1c3 100644
--- a/adb/adb_auth_host.cpp
+++ b/adb/adb_auth_host.cpp
@@ -207,11 +207,6 @@
     }
 
     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 @@
                 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;
     }