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

Commit b6d1fb58 authored by Spencer Low's avatar Spencer Low Committed by android-build-merger
Browse files

Merge "adb: really make kill-server wait for server death" am: 91a25771 

am: 39ba54ee

Change-Id: Id3156a2dfe71e1f558347ffabb3d311b93531420
parents 4ddfdbee 39ba54ee

adb/client/adb_client.cpp

+5 −0
Original line number Diff line number Diff line
@@ -185,6 +185,11 @@ bool adb_kill_server() { 
        return false;

    }



    // The server might send OKAY, so consume that.

    char buf[4];

    ReadFdExactly(fd, buf, 4);

    // Now that no more data is expected, wait for socket orderly shutdown or error, indicating

    // server death.

    ReadOrderlyShutdown(fd);

    return true;

}