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

am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process" 

* commit 'c1b6378d96dda18f1a6b9d9cf33f9ed4eb6f6603':
  adb: fix killing of old version of adb process
This commit is contained in:
Elliott Hughes 2015-08-07 20:21:02 +00:00 committed by Android Git Automerger
parent 08fe47e3bd c1b6378d96
commit a4a902432e
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;
}
}