summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-04-26 20:59:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-04-26 20:59:56 +0000
commit84d43c8df783446ddd313f7bee6b13766b279893 (patch)
treed1c33a127d6c5181b01a1c3b0c4a5bab912d5b85 /init
parent8cde09064ed347aef6621923beff4238fbd849ad (diff)
parente2b04b71ae3792e2d8d2fda537343549ebfcc8bb (diff)
downloadcore-84d43c8df783446ddd313f7bee6b13766b279893.tar.gz
core-84d43c8df783446ddd313f7bee6b13766b279893.tar.bz2
core-84d43c8df783446ddd313f7bee6b13766b279893.zip
Merge "do not start shutdown animation from init"
Diffstat (limited to 'init')
-rw-r--r--init/reboot.cpp9
1 files changed, 0 insertions, 9 deletions
diff --git a/init/reboot.cpp b/init/reboot.cpp
index 395d21b65..d6baa2699 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -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