tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Trigger boot animation on userspace reboot"

Browse source
This commit is contained in:
Nikita Ioffe 2020-01-29 11:24:01 +00:00 committed by Gerrit Code Review
commit 2d88794a7d
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/reboot.cpp
View file

@ -741,12 +741,15 @@ static Result<void> DoUserspaceReboot() {
});
// Triggering userspace-reboot-requested will result in a bunch of setprop
// actions. We should make sure, that all of them are propagated before
// proceeding with userspace reboot. Synchronously setting kUserspaceRebootInProgress property
// is not perfect, but it should do the trick.
// proceeding with userspace reboot. Synchronously setting sys.init.userspace_reboot.in_progress
// property is not perfect, but it should do the trick.
if (!android::sysprop::InitProperties::userspace_reboot_in_progress(true)) {
return Error() << "Failed to set sys.init.userspace_reboot.in_progress property";
}
EnterShutdown();
if (!SetProperty("sys.powerctl", "")) {
return Error() << "Failed to reset sys.powerctl property";
}
std::vector<Service*> stop_first;
// Remember the services that were enabled. We will need to manually enable them again otherwise
// triggers like class_start won't restart them.

2
rootdir/init.rc
View file

@ -1012,6 +1012,7 @@ on userspace-reboot-requested
setprop apexd.status ""
setprop sys.user.0.ce_available ""
setprop sys.shutdown.requested ""
setprop service.bootanim.exit ""
on userspace-reboot-fs-remount
# Make sure that vold is running.
@ -1021,6 +1022,7 @@ on userspace-reboot-fs-remount
exec - system system -- /system/bin/vdc checkpoint resetCheckpoint
exec - system system -- /system/bin/vdc checkpoint markBootAttempt
remount_userdata
start bootanim
on userspace-reboot-resume
trigger userspace-reboot-fs-remount