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

Commit 2020dd6f authored by Josh Gao's avatar Josh Gao
Browse files

adb: wait for device to disconnect upon `adb root`. 

Previously, there was a race where if adb root took longer than 3
seconds to take effect, we'd return early and allow subsequent commands
to be targeted at the still-not-dead transport, and spuriously fail.

Bug: http://b/124244488
Test: test_device.py
Change-Id: I791a4f82946eb28e4d37729ab0ed3b7fc05b42a2
parent 1e9e471c

adb/client/commandline.cpp

+5 −4
Original line number Diff line number Diff line
@@ -1047,7 +1047,8 @@ static bool wait_for_device(const char* service) { 
static bool adb_root(const char* command) {

    std::string error;



    unique_fd fd(adb_connect(android::base::StringPrintf("%s:", command), &error));

    TransportId transport_id;

    unique_fd fd(adb_connect(&transport_id, android::base::StringPrintf("%s:", command), &error));

    if (fd < 0) {

        fprintf(stderr, "adb: unable to connect for %s: %s\n", command, error.c_str());

        return false;
@@ -1080,9 +1081,9 @@ static bool adb_root(const char* command) { 
        return true;

    }



    // Give adbd some time to kill itself and come back up.

    // We can't use wait-for-device because devices (e.g. adb over network) might not come back.

    std::this_thread::sleep_for(3s);

    // Wait for the device to go away.

    adb_set_transport(kTransportAny, nullptr, transport_id);

    wait_for_device("wait-for-disconnect");

    return true;

}