pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Attempt native rollback for frequent crashes before boot completed"

This commit is contained in:
Zimuzo Ezeozue 2019-04-30 22:57:39 +00:00 committed by Gerrit Code Review
parent 446014ecf9 88de80fc53
commit e9252285ef
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init/README.md
View File

@ -191,7 +191,7 @@ runs the service.
`critical`
> This is a device-critical service. If it exits more than four times in
four minutes, the device will reboot into bootloader.
four minutes or before boot completes, the device will reboot into bootloader.
`disabled`
> This service will not automatically start with its class.

12
init/service.cpp
View File

@ -372,16 +372,20 @@ void Service::Reap(const siginfo_t& siginfo) {
return;
}
// If we crash > 4 times in 4 minutes, reboot into bootloader or set crashing property
// If we crash > 4 times in 4 minutes or before boot_completed,
// reboot into bootloader or set crashing property
boot_clock::time_point now = boot_clock::now();
if (((flags_ & SVC_CRITICAL) || !pre_apexd_) && !(flags_ & SVC_RESTART)) {
if (now < time_crashed_ + 4min) {
bool boot_completed = android::base::GetBoolProperty("sys.boot_completed", false);
if (now < time_crashed_ + 4min || !boot_completed) {
if (++crash_count_ > 4) {
if (flags_ & SVC_CRITICAL) {
// Aborts into bootloader
LOG(FATAL) << "critical process '" << name_ << "' exited 4 times in 4 minutes";
LOG(FATAL) << "critical process '" << name_ << "' exited 4 times "
<< (boot_completed ? "in 4 minutes" : "before boot completed");
} else {
LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times in 4 minutes";
LOG(ERROR) << "updatable process '" << name_ << "' exited 4 times "
<< (boot_completed ? "in 4 minutes" : "before boot completed");
// Notifies update_verifier and apexd
property_set("ro.init.updatable_crashing", "1");
}