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

This commit is contained in:
Keun-young Park 2017-04-26 22:30:42 +00:00 committed by Android (Google) Code Review
commit 2083079018

View file

@ -341,18 +341,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