commit e62a3b4bdce7f73ccaf206c49406940459391045
author Elliott Hughes <enh@google.com> Sat Dec 03 04:37:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 03 04:37:12 2016 +0000
tree 061b1787d6e3b10e2f45996ebf266722559e46fd
parent aec73165464c2ea8233bc3cbbbdb17085bce91dc
parent 32ca0ab616037bfd6bcc624cbf91c37b622e1657

Merge "Remove unused adb_set_transport." am: b898ce00fa
am: 32ca0ab616

Change-Id: I4bb931e7df83a623f8c40064ccfcb6b27b12f68e

adb/adb_client.cpp

diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp
index 0b1ba32..ef52189 100644
--- a/adb/adb_client.cpp
+++ b/adb/adb_client.cpp
@@ -46,21 +46,11 @@
 
 static const char* __adb_server_socket_spec;
 
-void adb_set_transport(TransportType type, const char* serial)
-{
+void adb_set_transport(TransportType type, const char* serial) {
     __adb_transport = type;
     __adb_serial = serial;
 }
 
-void adb_get_transport(TransportType* type, const char** serial) {
-    if (type) {
-        *type = __adb_transport;
-    }
-    if (serial) {
-        *serial = __adb_serial;
-    }
-}
-
 void adb_set_socket_spec(const char* socket_spec) {
     if (__adb_server_socket_spec) {
         LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec " << socket_spec << " (was " << __adb_server_socket_spec << ")";

adb/adb_client.h

diff --git a/adb/adb_client.h b/adb/adb_client.h
index d35d705..d07c1e9 100644
--- a/adb/adb_client.h
+++ b/adb/adb_client.h
@@ -40,9 +40,6 @@
 // Set the preferred transport to connect to.
 void adb_set_transport(TransportType type, const char* _Nullable serial);
 
-// Get the preferred transport to connect to.
-void adb_get_transport(TransportType* _Nullable type, const char* _Nullable* _Nullable serial);
-
 // Set the socket specification for the adb server.
 // This function can only be called once, and the argument must live to the end of the process.
 void adb_set_socket_spec(const char* _Nonnull socket_spec);