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

Merge "Unify logic for resetting properties before userspace reboot"

Browse source 
am: 636ad74313

Change-Id: I4eca9ea918d2fa22db467a69cafada09bbd94d52
This commit is contained in:
Nikita Ioffe 2019-12-20 16:45:57 -08:00 • committed by android-build-merger
commit e813196585
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
init/reboot.cpp
View file

@ -834,7 +834,7 @@ static void UserspaceRebootWatchdogThread() {
}
static void HandleUserspaceReboot() {
if (!android::sysprop::InitProperties::userspace_reboot_in_progress().value_or(false)) {
if (!android::sysprop::InitProperties::is_userspace_reboot_supported().value_or(false)) {
LOG(ERROR) << "Attempted a userspace reboot on a device that doesn't support it";
return;
}

2
init/service.cpp
View file

@ -325,8 +325,8 @@ void Service::Reap(const siginfo_t& siginfo) {
LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times "
<< (boot_completed ? "in 4 minutes" : "before boot completed");
// Notifies update_verifier and apexd
SetProperty("sys.init.updatable_crashing", "1");
SetProperty("sys.init.updatable_crashing_process_name", name_);
SetProperty("sys.init.updatable_crashing", "1");
}
}
} else {

6
rootdir/init.rc
View file

@ -978,9 +978,11 @@ on init && property:ro.debuggable=1
on userspace-reboot-requested
# TODO(b/135984674): reset all necessary properties here.
setprop sys.boot_completed 0
setprop sys.init.updatable_crashing 0
setprop sys.boot_completed ""
setprop sys.init.updatable_crashing ""
setprop sys.init.updatable_crashing_process_name ""
setprop apexd.status ""
setprop sys.user.0.ce_available ""
on userspace-reboot-fs-remount
# Make sure that vold is running.