Merge "Removing dead-code (dev: local service processing)." am: eddd2d3a38 am: d5bd2e5bcc am: afa6196b93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/1956636
Change-Id: Ifbef8f0b9f21e26115bc2bb962a8012321c6159c
diff --git a/SERVICES.TXT b/SERVICES.TXT
index 43e2396..e0c95c4 100644
--- a/SERVICES.TXT
+++ b/SERVICES.TXT
@@ -172,12 +172,6 @@
This request may not succeed on certain builds which do not allow
that.
-dev:<path>
- Opens a device file and connects the client directly to it for
- read/write purposes. Useful for debugging, but may require special
- privileges and thus may not run on all devices. <path> is a full
- path from the root of the filesystem.
-
tcp:<port>
Tries to connect to tcp port <port> on localhost.
diff --git a/client/commandline.cpp b/client/commandline.cpp
index 7969356..0b97ea4 100644
--- a/client/commandline.cpp
+++ b/client/commandline.cpp
@@ -117,7 +117,6 @@
" localabstract:<unix domain socket name>\n"
" localreserved:<unix domain socket name>\n"
" localfilesystem:<unix domain socket name>\n"
- " dev:<character device name>\n"
" jdwp:<process pid> (remote only)\n"
" vsock:<CID>:<port> (remote only)\n"
" acceptfd:<fd> (listen only)\n"
@@ -1009,13 +1008,6 @@
return 1;
}
-/**
- * Run ppp in "notty" mode against a resource listed as the first parameter
- * eg:
- *
- * ppp dev:/dev/omap_csmi_tty0 <ppp options>
- *
- */
static int ppp(int argc, const char** argv) {
#if defined(_WIN32)
error_exit("adb %s not implemented on Win32", argv[0]);
diff --git a/daemon/services.cpp b/daemon/services.cpp
index a9d1fe8..d86b54a 100644
--- a/daemon/services.cpp
+++ b/daemon/services.cpp
@@ -49,7 +49,6 @@
#include "adb_utils.h"
#include "services.h"
#include "socket_spec.h"
-#include "sysdeps.h"
#include "transport.h"
#include "daemon/file_sync_service.h"
@@ -309,9 +308,7 @@
}
#endif
- if (android::base::ConsumePrefix(&name, "dev:")) {
- return unique_fd{unix_open(name, O_RDWR | O_CLOEXEC)};
- } else if (android::base::ConsumePrefix(&name, "jdwp:")) {
+ if (android::base::ConsumePrefix(&name, "jdwp:")) {
pid_t pid;
if (!ParseUint(&pid, name)) {
return unique_fd{};