commit 284d0cf7463882ce05e51ceae25c31d29a532d37
author Nikita Ioffe <ioffe@google.com> Thu Feb 27 20:46:27 2020 +0000
committer Nikita Ioffe <ioffe@google.com> Sat Feb 29 13:18:39 2020 +0000
tree f7c4d5d4de1b990dd421887db1d9fef978e72fee
parent caca3a9f5ad15c9a04408e69f611d45ebf42079b

Reset post_data_ and services_update_finished_ on userspace reboot

Test: adb reboot userspace
Bug: 143970043
Change-Id: I77d47a8460b1526337a318547a59141334e11cdd
Merged-In: I77d47a8460b1526337a318547a59141334e11cdd
(cherry picked from commit 3ad292025c022dac2139e5a33debf850df27a9af)

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_;