commit df1998af7e78d015b9d535f66759d9797a2c4ddd
author Paul Lawrence <paullawrence@google.com> Tue Sep 16 22:53:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 16 22:53:18 2014 +0000
tree bcbe50e99b3fc62f8467bee4e25155d67bd4e3fe
parent 4c13769dbab130a21a802df61a8a7fa8a059ffa4
parent 48fb175d22a80ac39db803a8bb78df876971c64b

am 48fb175d: am 40af0929: Fix charger mode on first boot of force encrypt devices

* commit '48fb175d22a80ac39db803a8bb78df876971c64b':
  Fix charger mode on first boot of force encrypt devices

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index de83c93..8dbaab7 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -515,7 +515,12 @@
     pid = fork();
     if (pid > 0) {
         /* Parent.  Wait for the child to return */
-        waitpid(pid, &status, 0);
+        int wp_ret = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0));
+        if (wp_ret < 0) {
+            /* Unexpected error code. We will continue anyway. */
+            NOTICE("waitpid failed rc=%d, errno=%d\n", wp_ret, errno);
+        }
+
         if (WIFEXITED(status)) {
             ret = WEXITSTATUS(status);
         } else {