commit 07533c520c428932945cdbdc73c25fe27bd376e2
author David Anderson <dvander@google.com> Fri Jun 02 12:00:12 2023 -0700
committer David Anderson <dvander@google.com> Mon Jun 05 12:59:54 2023 -0700
tree 0eb7263c4db199f51062d4c1bc7ca25a89df3753
parent bce8618a16e1b973a9ca47ab76f0ec7519c32b36

init: Fix ramdump when enabling shutdown animations.

Fix a bug where services weren't stopped properly if shutdown animations
were enabled.

Bug: 285241485
Test: Pixel w/ ro.init.shutdown_animation=true
Change-Id: I7f35572b5223f03f3f5a341fa7b5e90c01d56ce3

init/reboot.cpp

diff --git a/init/reboot.cpp b/init/reboot.cpp
index 27a7876..3351c4c 100644
--- a/init/reboot.cpp
+++ b/init/reboot.cpp
@@ -680,8 +680,8 @@
                            << "': " << result.error();
             }
             s->SetShutdownCritical();
-        } else if (do_shutdown_animation) {
-            continue;
+        } else if (do_shutdown_animation && s->classnames().count("animation") > 0) {
+            // Need these for shutdown animations.
         } else if (s->IsShutdownCritical()) {
             // Start shutdown critical service if not started.
             if (auto result = s->Start(); !result.ok()) {