am 6a701bd9: am b53b521e: Merge "Add `adb features`."
* commit '6a701bd94b067c2ab873964f63c3d954bc59610f':
Add `adb features`.
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);
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;