commit 8d1f9ff03ea4ccd0ed33a77ec057f6ecb708fe69
author Keun-young Park <keunyoung@google.com> Wed Apr 26 21:05:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 21:05:41 2017 +0000
tree d1c33a127d6c5181b01a1c3b0c4a5bab912d5b85
parent c954872441810542ea05f70e910c28b7b01ad990
parent acdfaa828993b71dc9a06336d56203db12aa0485

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

Change-Id: I2cc5860c125a34b356bff9b62a9027ee293da683

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 395d21b..d6baa26 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -345,18 +345,9 @@
     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