commit 1f6bb7801c0421562d430ddc94df18ec16d26fc4
author Nikita Ioffe <ioffe@google.com> Mon Mar 02 18:01:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 02 18:01:54 2020 +0000
tree 298818e25af432b4f603d20b6ba31d6c9874e768
parent 1b359a27a649f42f82e7d89ee35e50f5d705ac28
parent 03594fa902f914eb55be144f4339a2564985151a

Merge "Reset post_data_ and services_update_finished_ on userspace reboot" into rvc-dev

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 08b99ab..8d8bd8e 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -817,6 +817,7 @@
         LOG(INFO) << "Re-enabling service '" << s->name() << "'";
         s->Enable();
     }
+    ServiceList::GetInstance().ResetState();
     LeaveShutdown();
     ActionManager::GetInstance().QueueEventTrigger("userspace-reboot-resume");
     guard.Disable();  // Go on with userspace reboot.

init/service_list.h

diff --git a/init/service_list.h b/init/service_list.h
index 1838624..3b9018b 100644
--- a/init/service_list.h
+++ b/init/service_list.h
@@ -75,6 +75,11 @@
     bool IsServicesUpdated() const { return services_update_finished_; }
     void DelayService(const Service& service);
 
+    void ResetState() {
+        post_data_ = false;
+        services_update_finished_ = false;
+    }
+
   private:
     std::vector<std::unique_ptr<Service>> services_;