Merge "Remove unused adb_set_transport." am: b898ce00fa (e62a3b4b) · Commits · e / os / android_system_core

adb/adb_client.cpp

+1 −11

Original line number	Diff line number	Diff line
		@@ -46,21 +46,11 @@ static const char* __adb_serial = NULL;

		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 << ")";

+0 −3

Original line number	Diff line number	Diff line
		@@ -40,9 +40,6 @@ bool adb_query(const std::string& service, std::string* _Nonnull result,
		// 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);