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

Commit 4bf137dd authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge \\\\"adb: make adb root not wait-for-device.\\\\" am: 81e59ca5 am:...

Merge \\\\"adb: make adb root not wait-for-device.\\\\" am: 81e59ca5 am: ba7aea82 am: 483d68ec
am: eb1be408

Change-Id: I7ede9f12f82197b203d125464c99af9256587509
parents 7e212f48 eb1be408
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -1107,12 +1107,10 @@ static bool adb_root(const char* command) {
        return true;
    }

    // Give adbd 500ms to kill itself, then wait-for-device for it to come back up.
    adb_sleep_ms(500);
    TransportType type;
    const char* serial;
    adb_get_transport(&type, &serial);
    return wait_for_device("wait-for-any", type, serial);
    // 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.
    adb_sleep_ms(3000);
    return true;
}

// Connects to the device "shell" service with |command| and prints the