commit 12d5a8015a7deab6dc8fdb9e30769313d7f91ff2
author David Pursell <dpursell@google.com> Fri Aug 14 16:13:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 16:13:13 2015 +0000
tree 7c9379bab40aa2eb1dbd8dd6ccfc4bb62ba11a35
parent 750b652da84801b6cc970dadcf0c26fe51d4fa07
parent 6183e48d2466a84e486ff37720688485e4c50009

am 6a701bd9: am b53b521e: Merge "Add `adb features`."

* commit '6a701bd94b067c2ab873964f63c3d954bc59610f':
  Add `adb features`.

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 180954b..29c9481 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -956,6 +956,13 @@
         return 1;
     }
 
+    if (!strcmp(service, "features")) {
+        SendOkay(reply_fd);
+        SendProtocolString(
+            reply_fd, android::base::Join(supported_features(), '\n'));
+        return 0;
+    }
+
     // remove TCP transport
     if (!strncmp(service, "disconnect:", 11)) {
         const std::string address(service + 11);

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 2b496cc..5c5b633 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1468,6 +1468,9 @@
         fprintf(stdout, "%s", adb_version().c_str());
         return 0;
     }
+    else if (!strcmp(argv[0], "features")) {
+        return adb_query_command("host:features");
+    }
 
     usage();
     return 1;