Merge "Fix shutdown animation cannot be shown" (95983cbb) · Commits · e / os / android_system_core

init/reboot.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -639,6 +639,7 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str
		abort();
		}

		bool do_shutdown_animation = GetBoolProperty("ro.init.shutdown_animation", false);
		// watchdogd is a vendor specific component but should be alive to complete shutdown safely.
		const std::set<std::string> to_starts{"watchdogd"};
		std::set<std::string> stop_first;
		@@ -652,6 +653,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 (s->IsShutdownCritical()) {
		// Start shutdown critical service if not started.
		if (auto result = s->Start(); !result.ok()) {
		@@ -664,14 +667,13 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str
		}

		// remaining operations (specifically fsck) may take a substantial duration
		if (cmd == ANDROID_RB_POWEROFF \|\| is_thermal_shutdown) {
		if (!do_shutdown_animation && (cmd == ANDROID_RB_POWEROFF \|\| is_thermal_shutdown)) {
		TurnOffBacklight();
		}

		Service* boot_anim = ServiceList::GetInstance().FindService("bootanim");
		Service* surface_flinger = ServiceList::GetInstance().FindService("surfaceflinger");
		if (boot_anim != nullptr && surface_flinger != nullptr && surface_flinger->IsRunning()) {
		bool do_shutdown_animation = GetBoolProperty("ro.init.shutdown_animation", false);

		if (do_shutdown_animation) {
		SetProperty("service.bootanim.exit", "0");