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

Commit 20830790 authored by Keun-young Park's avatar Keun-young Park Committed by Android (Google) Code Review
Browse files

Merge "do not start shutdown animation from init" into oc-dev

parents 1c268a86 92b03051

init/reboot.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -341,18 +341,9 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re 
    Service* bootAnim = ServiceManager::GetInstance().FindServiceByName("bootanim");

    Service* bootAnim = ServiceManager::GetInstance().FindServiceByName("bootanim");

    Service* surfaceFlinger = ServiceManager::GetInstance().FindServiceByName("surfaceflinger");

    Service* surfaceFlinger = ServiceManager::GetInstance().FindServiceByName("surfaceflinger");

    if (bootAnim != nullptr && surfaceFlinger != nullptr && surfaceFlinger->IsRunning()) {

    if (bootAnim != nullptr && surfaceFlinger != nullptr && surfaceFlinger->IsRunning()) {

        property_set("service.bootanim.exit", "0");

        // Could be in the middle of animation. Stop and start so that it can pick

        // up the right mode.

        bootAnim->Stop();

        // start all animation classes if stopped.

        ServiceManager::GetInstance().ForEachServiceInClass("animation", [](Service* s) {

        ServiceManager::GetInstance().ForEachServiceInClass("animation", [](Service* s) {

            s->Start();

            s->SetShutdownCritical();  // will not check animation class separately

            s->SetShutdownCritical();  // will not check animation class separately

        });

        });

        bootAnim->Start();

        surfaceFlinger->SetShutdownCritical();

        bootAnim->SetShutdownCritical();

    }

    }





    // optional shutdown step

    // optional shutdown step