From 92b03051f81215464633af9e08cf810ec586ec46 Mon Sep 17 00:00:00 2001 From: Keun-young Park Date: Wed, 19 Apr 2017 10:46:31 -0700 Subject: [PATCH] do not start shutdown animation from init - init will only keep animation related services as shutdown critical. - external component like system server can start shutdown animation. bug: 37500823 Test: reboot (cherry picked from commit e2b04b71ae3792e2d8d2fda537343549ebfcc8bb) Change-Id: I9a0432148887557b705d6b8bbe35f5fb1ffad5b9 --- init/reboot.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/init/reboot.cpp b/init/reboot.cpp index e234f961c..81f1246e4 100644 --- a/init/reboot.cpp +++ b/init/reboot.cpp @@ -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