ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add boot animation progress system property." am: 5266e041ef am: 6d2e6e246c am: 69fab4410c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifde01593e054ae005cb58d7d4d58380da4103629
This commit is contained in:
Nicolas Geoffray 2021-01-07 10:18:08 +00:00 • committed by Automerger Merge Worker
commit a782a5c8d6
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/reboot.cpp
View file

@ -658,6 +658,7 @@ static void DoReboot(unsigned int cmd, const std::string& reason, const std::str
if (do_shutdown_animation) {
SetProperty("service.bootanim.exit", "0");
SetProperty("service.bootanim.progress", "0");
// Could be in the middle of animation. Stop and start so that it can pick
// up the right mode.
boot_anim->Stop();

2
rootdir/init.rc
View file

@ -1071,6 +1071,7 @@ on property:vold.decrypt=trigger_restart_framework
class_start main
class_start late_start
setprop service.bootanim.exit 0
setprop service.bootanim.progress 0
start bootanim
on property:vold.decrypt=trigger_shutdown_framework
@ -1172,6 +1173,7 @@ on userspace-reboot-requested
setprop sys.user.0.ce_available ""
setprop sys.shutdown.requested ""
setprop service.bootanim.exit ""
setprop service.bootanim.progress ""
on userspace-reboot-fs-remount
# Make sure that vold is running.