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

This commit is contained in:
Nikita Ioffe 2020-03-02 18:01:54 +00:00 committed by Android (Google) Code Review
commit efab99063d
2 changed files with 6 additions and 0 deletions

View file

@ -817,6 +817,7 @@ static Result<void> DoUserspaceReboot() {
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.

View file

@ -75,6 +75,11 @@ class ServiceList {
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_;