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

Commit 6fb94611 authored by Josh Gao's avatar Josh Gao
Browse files

adbd: when rebooting, don't close socket before pausing. 

An accidental side-effect of the change to unique_fd was that we
started closing the reboot service socket before pausing and waiting
for our death. This results in the client immediately returning, which
means they might get a chance to run other commands before we actually
manage to reboot.

Bug: http://b/112104037
Test: adb reboot; adb devices
Change-Id: Id61321da0c08ebd1ab57f1ce926bafd9109dd9c2
parent ddcee93c

adb/daemon/services.cpp

+4 −11
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ void restart_usb_service(unique_fd fd) { 
    WriteFdExactly(fd.get(), "restarting in USB mode\n");

}



bool reboot_service_impl(unique_fd fd, const std::string& arg) {

void reboot_service(unique_fd fd, const std::string& arg) {

    std::string reboot_arg = arg;

    bool auto_reboot = false;
@@ -108,7 +108,7 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) { 
    if (reboot_arg == "sideload") {

        if (getuid() != 0) {

            WriteFdExactly(fd.get(), "'adb root' is required for 'adb reboot sideload'.\n");

            return false;

            return;

        }



        const std::vector<std::string> options = {auto_reboot ? "--sideload_auto_reboot"
@@ -116,7 +116,7 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) { 
        std::string err;

        if (!write_bootloader_message(options, &err)) {

            D("Failed to set bootloader message: %s", err.c_str());

            return false;

            return;

        }



        reboot_arg = "recovery";
@@ -128,16 +128,9 @@ bool reboot_service_impl(unique_fd fd, const std::string& arg) { 
    std::string reboot_string = android::base::StringPrintf("reboot,%s", reboot_arg.c_str());

    if (!android::base::SetProperty(ANDROID_RB_PROPERTY, reboot_string)) {

        WriteFdFmt(fd.get(), "reboot (%s) failed\n", reboot_string.c_str());

        return false;

    }



    return true;

}



void reboot_service(unique_fd fd, const std::string& arg) {

    if (!reboot_service_impl(std::move(fd), arg)) {

        return;

    }



    // Don't return early. Give the reboot command time to take effect

    // to avoid messing up scripts which do "adb reboot && adb wait-for-device"

    while (true) {