Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0b9d706 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: Fix ramdump when enabling shutdown animations." am: 3b210bc6 am: efbba8cf 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2613313



Change-Id: Ibda3c6f42f284e490517046b1648ab49eb163b11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6586c265 efbba8cf

init/reboot.cpp

+2 −2
Original line number Diff line number Diff line
@@ -680,8 +680,8 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str 
                           << "': " << 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()) {