Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "UserspaceRebootLogger: query sys.boot.reason.last" into rvc-dev am: 2773260387

Browse Source 
Change-Id: I9d41bd810932d376fe2705672a8a07381f20aff3
This commit is contained in:
Automerger Merge Worker
2020-02-24 16:59:03 +00:00
parent 6d47e1591d 2773260387
commit a884b62333
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
services/core/java/com/android/server/UserspaceRebootLogger.java
View File

@@ -26,6 +26,7 @@ import static com.android.internal.util.FrameworkStatsLog.USERSPACE_REBOOT_REPOR
import android.os.SystemClock; import android.os.SystemClock;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.text.TextUtils;
import android.util.Slog; import android.util.Slog;
import com.android.internal.util.FrameworkStatsLog; import com.android.internal.util.FrameworkStatsLog;
@@ -45,7 +46,7 @@ public final class UserspaceRebootLogger {
"sys.userspace_reboot.log.last_started"; "sys.userspace_reboot.log.last_started";
private static final String USERSPACE_REBOOT_LAST_FINISHED_PROPERTY = private static final String USERSPACE_REBOOT_LAST_FINISHED_PROPERTY =
"sys.userspace_reboot.log.last_finished"; "sys.userspace_reboot.log.last_finished";
private static final String BOOT_REASON_PROPERTY = "sys.boot.reason"; private static final String LAST_BOOT_REASON_PROPERTY = "sys.boot.reason.last";
private UserspaceRebootLogger() {} private UserspaceRebootLogger() {}
@@ -111,26 +112,28 @@ public final class UserspaceRebootLogger {
if (SystemProperties.getLong(USERSPACE_REBOOT_LAST_STARTED_PROPERTY, -1) != -1) { if (SystemProperties.getLong(USERSPACE_REBOOT_LAST_STARTED_PROPERTY, -1) != -1) {
return USERSPACE_REBOOT_REPORTED__OUTCOME__SUCCESS; return USERSPACE_REBOOT_REPORTED__OUTCOME__SUCCESS;
} }
String reason = SystemProperties.get(BOOT_REASON_PROPERTY, ""); String reason = TextUtils.emptyIfNull(SystemProperties.get(LAST_BOOT_REASON_PROPERTY, ""));
if (reason.startsWith("reboot,")) { if (reason.startsWith("reboot,")) {
reason = reason.substring("reboot".length()); reason = reason.substring("reboot".length());
} }
switch (reason) { if (reason.startsWith("userspace_failed,watchdog_fork")) {
case "userspace_failed,watchdog_fork":
// Since fork happens before shutdown sequence, attribute it to
// USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_SHUTDOWN_SEQUENCE_ABORTED.
case "userspace_failed,shutdown_aborted":
return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_SHUTDOWN_SEQUENCE_ABORTED; return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_SHUTDOWN_SEQUENCE_ABORTED;
case "userspace_failed,init_user0_failed": }
// init_user0 will fail if userdata wasn't remounted correctly, attribute to if (reason.startsWith("userspace_failed,shutdown_aborted")) {
// USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERDATA_REMOUNT. return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_SHUTDOWN_SEQUENCE_ABORTED;
case "mount_userdata_failed": }
if (reason.startsWith("mount_userdata_failed")) {
return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERDATA_REMOUNT; return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERDATA_REMOUNT;
case "userspace_failed,watchdog_triggered": }
return if (reason.startsWith("userspace_failed,init_user0")) {
USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERSPACE_REBOOT_WATCHDOG_TRIGGERED; return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERDATA_REMOUNT;
default: }
if (reason.startsWith("userspace_failed,enablefilecrypto")) {
return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERDATA_REMOUNT;
}
if (reason.startsWith("userspace_failed,watchdog_triggered")) {
return USERSPACE_REBOOT_REPORTED__OUTCOME__FAILED_USERSPACE_REBOOT_WATCHDOG_TRIGGERED;
}
return USERSPACE_REBOOT_REPORTED__OUTCOME__OUTCOME_UNKNOWN; return USERSPACE_REBOOT_REPORTED__OUTCOME__OUTCOME_UNKNOWN;
} }
}
} }