Merge "adb: Fix return value in error case" am: 2925a580e9

am: 73308830a6

Change-Id: I7cf13d7e4f5850b99fdd843fbd09e349cfea8bee
This commit is contained in:
Greg Kaiser 2019-03-18 14:22:51 -07:00 committed by android-build-merger
commit 507be15cf8

View file

@ -259,7 +259,7 @@ static bool __adb_check_server_version(std::string* error) {
if (fd >= 0) {
std::string version_string;
if (!ReadProtocolString(fd, &version_string, error)) {
return -1;
return false;
}
ReadOrderlyShutdown(fd);