Commit 71635bb9 authored Aug 05, 2015 by Spencer Low

adb: fix killing of old version of adb process



The original code was:

  if (strcmp(__adb_error, "unknown host service") != 0)

But that was changed by 078f0fcf to:

  if (*error == "unknown host service") {

I think the comparison should be != so that "unknown host service"
falls-through and kills the server, and so if it is some other error,
that the other error is returned immediately.

Change-Id: Ia490a4a870d1d123a3c5ab258dd5fa0930e8032d
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>

parent 7f2e05e9

adb/adb_client.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}