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

Commit 0bf7924d authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 91704522: Don\'t return immediately from reboot commands. 

* commit '91704522':
  Don't return immediately from reboot commands.
parents 396f6b77 91704522

adb/services.c

+4 −0
Original line number Diff line number Diff line
@@ -144,7 +144,11 @@ void reboot_service(int fd, void *arg) 
    if (ret < 0) {

        snprintf(buf, sizeof(buf), "reboot failed: %d\n", ret);

        writex(fd, buf, strlen(buf));

        goto cleanup;

    }

    // 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(1) { pause(); }

cleanup:

    free(arg);

    adb_close(fd);

reboot/reboot.c

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ int main(int argc, char *argv[]) 
        perror("reboot");

        exit(EXIT_FAILURE);

    }



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

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

    while(1) { pause(); }



    fprintf(stderr, "Done\n");

    return 0;

}