commit 2bed5cd250ec9b42452317a5641ec87a21bc4bf7
author Tao Wu <lepton@google.com> Fri Oct 27 22:25:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 27 22:25:59 2017 +0000
tree 03c41aaf264d0f3a64c2ebb55b25b3dab066651c
parent 1302fa105cc421669f3a444f0caf570a3c48710b
parent d322423ad3bf35114c71a83174a2e7144312e534

Merge "Fix race condition between restart and stop/reset." am: ee14225e0d am: 5c5a6bdc87
am: 8b0654925d

Change-Id: I432f815f2b40208d3f3949a033973ee4dd179a9a

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 45e3f06..12acfc6 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -960,6 +960,13 @@
     } else {
         flags_ |= how;
     }
+    // Make sure it's in right status when a restart immediately follow a
+    // stop/reset or vice versa.
+    if (how == SVC_RESTART) {
+        flags_ &= (~(SVC_DISABLED | SVC_RESET));
+    } else {
+        flags_ &= (~SVC_RESTART);
+    }
 
     if (pid_) {
         KillProcessGroup(SIGKILL);