Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 284d0cf7 authored by Nikita Ioffe's avatar Nikita Ioffe
Browse files

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 3ad29202)
parent caca3a9f

init/reboot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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.

init/service_list.h

+5 −0
Original line number Diff line number Diff line
@@ -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_;