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

Merge "WA: Fix adb wait-for-device command" am: bf867cac7e 

am: 4da27b1014

* commit '4da27b101499c59eb85e9650a97a7b2f980a2dee':
  WA: Fix adb wait-for-device command
This commit is contained in:
Josh Gao 2016-01-07 01:27:03 +00:00 committed by android-build-merger
parent f01db4f68b 4da27b1014
commit 62d65862a4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
adb/services.cpp
View File

@ -368,8 +368,9 @@ static void wait_for_state(int fd, void* data) {
while (true) {
bool is_ambiguous = false;
std::string error = "unknown error";
atransport* t = acquire_one_transport(sinfo->transport_type, sinfo->serial.c_str(),
&is_ambiguous, &error);
const char* serial = sinfo->serial.length() ? sinfo->serial.c_str() : NULL;
atransport* t = acquire_one_transport(sinfo->transport_type, serial, &is_ambiguous, &error);
if (t != nullptr && t->connection_state == sinfo->state) {
SendOkay(fd);
break;