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

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

Browse source 
am: bf867cac7e

* commit 'bf867cac7eac5e43b6a1b0157800f9ad09a711b9':
  WA: Fix adb wait-for-device command
This commit is contained in:
Josh Gao 2016-01-07 01:25:11 +00:00 • committed by android-build-merger
commit 4da27b1014
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;