tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "adb: fix killing of old version of adb process"

Browse source
This commit is contained in:
Elliott Hughes 2015-08-07 03:04:30 +00:00 committed by Gerrit Code Review
commit e1101677ea
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/adb_client.cpp
View file

@ -229,8 +229,9 @@ int adb_connect(const std::string& service, std::string* error) {
}
} else {
// if fd is -1, then check for "unknown host service",
// which would indicate a version of adb that does not support the version command
if (*error == "unknown host service") {
// which would indicate a version of adb that does not support the
// version command, in which case we should fall-through to kill it.
if (*error != "unknown host service") {
return fd;
}
}