Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908d6ed1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'c1b6378d':
  adb: fix killing of old version of adb process
parents 832b6dc4 c1b6378d

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;

            }

        }