ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove unused adb_set_transport." am: b898ce00fa

Browse source 
am: 32ca0ab616

Change-Id: I4bb931e7df83a623f8c40064ccfcb6b27b12f68e
This commit is contained in:
Elliott Hughes 2016-12-03 04:37:12 +00:00 • committed by android-build-merger
commit e62a3b4bdc
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
adb/adb_client.cpp
View file

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

3
adb/adb_client.h
View file

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