commit 22d634884539ee7995e214a7dccbdad238049f95
author Tom Cherry <tomcherry@google.com> Fri Mar 27 14:08:20 2020 -0700
committer Tom Cherry <tomcherry@google.com> Fri Mar 27 14:08:20 2020 -0700
tree 046e6f5b61dc006805a0d5a4ea7b9d6d34a11841
parent 68855276a1781cc1d7fbb636c035acd8dd21f62a

init: do not handle control messages after shutdown

We already stop queue'ing new control messages, but we forgot to stop
handling those control messages that are already queued.  This CL
fixes that.

Bug: 150863651
Test: CF reboots appropriately
Change-Id: Ifea07a30b868de23eb735db10d8bae410e1b98bb

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 20b4176..7631964 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -901,7 +901,9 @@
                 (*function)();
             }
         }
-        HandleControlMessages();
+        if (!IsShuttingDown()) {
+            HandleControlMessages();
+        }
     }
 
     return 0;