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

Commit a1543656 authored by Keun-young Park's avatar Keun-young Park Committed by android-build-merger
Browse files

Merge "do not start shutdown animation from init" am: 84d43c8d

am: 76a3b3ce

Change-Id: If1f6bba314fe2f09620ea0574715a51f68791e96
parents 606df0e2 76a3b3ce
Loading
Loading
Loading
Loading
+0 −9
Original line number Diff line number Diff line
@@ -345,18 +345,9 @@ void DoReboot(unsigned int cmd, const std::string& reason, const std::string& re
    Service* bootAnim = ServiceManager::GetInstance().FindServiceByName("bootanim");
    Service* surfaceFlinger = ServiceManager::GetInstance().FindServiceByName("surfaceflinger");
    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) {
            s->Start();
            s->SetShutdownCritical();  // will not check animation class separately
        });
        bootAnim->Start();
        surfaceFlinger->SetShutdownCritical();
        bootAnim->SetShutdownCritical();
    }

    // optional shutdown step