openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix adb flakiness on reboot 

am: eec5e52ea2

Change-Id: I3496785fa4aecbab424d9f9c516415b3a3daecb2
This commit is contained in:
Lingfeng Yang 2016-10-12 23:38:38 +00:00 committed by android-build-merger
parent cf11830695 eec5e52ea2
commit e476e9ce34
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adb/adb.h
View File

@ -160,8 +160,10 @@ int get_available_local_transport_index();
int init_socket_transport(atransport *t, int s, int port, int local);
void init_usb_transport(atransport *t, usb_handle *usb, ConnectionState state);
std::string getEmulatorSerialString(int console_port);
#if ADB_HOST
atransport* find_emulator_transport_by_adb_port(int adb_port);
atransport* find_emulator_transport_by_console_port(int console_port);
#endif
int service_to_fd(const char* name, const atransport* transport);

16
adb/transport_local.cpp
View File

@ -99,7 +99,8 @@ int local_connect_arbitrary_ports(int console_port, int adb_port, std::string* e
int fd = -1;
#if ADB_HOST
if (find_emulator_transport_by_adb_port(adb_port) != nullptr) {
if (find_emulator_transport_by_adb_port(adb_port) != nullptr ||
find_emulator_transport_by_console_port(console_port) != nullptr) {
return -1;
}
@ -116,7 +117,7 @@ int local_connect_arbitrary_ports(int console_port, int adb_port, std::string* e
D("client: connected on remote on fd %d", fd);
close_on_exec(fd);
disable_tcp_nagle(fd);
std::string serial = android::base::StringPrintf("emulator-%d", console_port);
std::string serial = getEmulatorSerialString(console_port);
if (register_socket_transport(fd, serial.c_str(), adb_port, 1) == 0) {
return 0;
}
@ -360,6 +361,11 @@ atransport* find_emulator_transport_by_adb_port_locked(int adb_port)
return NULL;
}
std::string getEmulatorSerialString(int console_port)
{
return android::base::StringPrintf("emulator-%d", console_port);
}
atransport* find_emulator_transport_by_adb_port(int adb_port)
{
adb_mutex_lock( &local_transports_lock );
@ -368,6 +374,12 @@ atransport* find_emulator_transport_by_adb_port(int adb_port)
return result;
}
atransport* find_emulator_transport_by_console_port(int console_port)
{
return find_transport(getEmulatorSerialString(console_port).c_str());
}
/* Only call this function if you already hold local_transports_lock. */
int get_available_local_transport_index_locked()
{