Merge "Snap for 11790536 from 2026332ed854631bf5bfbbcb49e9df98cc7fcc01 to sdk-release" into sdk-releasesdk-release

1 files changed, 4 insertions, 0 deletions

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 5a1b63b2e..d02ca1e49 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -453,6 +453,10 @@ static uint32_t SendControlMessage(const std::string& msg, const std::string& na
                                    SocketConnection* socket, std::string* error) {
     auto lock = std::lock_guard{accept_messages_lock};
     if (!accept_messages) {
+        // If we're already shutting down and you're asking us to stop something,
+        // just say we did (https://issuetracker.google.com/336223505).
+        if (msg == "stop") return PROP_SUCCESS;
+
         *error = "Received control message after shutdown, ignoring";
         return PROP_ERROR_HANDLE_CONTROL_MESSAGE;
     }