ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't return immediately from reboot commands.

Browse source 
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
This commit is contained in:
Nick Kralevich 2013-10-24 08:53:48 -07:00
parent a9e453f1b5
commit 917045222a
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
adb/services.c
View file

@ -144,7 +144,11 @@ void reboot_service(int fd, void *arg)
if (ret < 0) { if (ret < 0) {
snprintf(buf, sizeof(buf), "reboot failed: %d\n", ret); snprintf(buf, sizeof(buf), "reboot failed: %d\n", ret);
writex(fd, buf, strlen(buf)); 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: cleanup:
free(arg); free(arg);
adb_close(fd); adb_close(fd);

5
reboot/reboot.c
View file

@ -68,6 +68,11 @@ int main(int argc, char *argv[])
perror("reboot"); perror("reboot");
exit(EXIT_FAILURE); 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"); fprintf(stderr, "Done\n");
return 0; return 0;
} }