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

Commit 91704522 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Don't return immediately from reboot commands. 

The reboot commands return too fast, interfering with testing.
Add a pause(), which will allow the device time to complete the
reboot.

Change-Id: Ie9cc6eea67b7ff662ec71ea2329cbb94f8d55404
Bug: 11369303
parent a9e453f1

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;

}