Merge "Add new atom to log userspace reboot performance" into stage-aosp-master am: 17f00a5520

Change-Id: I63208ede5e393037aabb449db800a0d9ba950270
This commit is contained in:
Automerger Merge Worker
2020-02-04 09:11:23 +00:00

View File

@@ -352,6 +352,7 @@ message Atom {
PerfettoUploaded perfetto_uploaded = PerfettoUploaded perfetto_uploaded =
229 [(log_from_module) = "perfetto"]; 229 [(log_from_module) = "perfetto"];
VmsClientConnectionStateChanged vms_client_connection_state_changed = 230; VmsClientConnectionStateChanged vms_client_connection_state_changed = 230;
UserspaceRebootReported userspace_reboot_reported = 243;
} }
// Pulled events will start at field 10000. // Pulled events will start at field 10000.
@@ -7076,3 +7077,43 @@ message UpdateEngineSuccessfulUpdateReported {
// The number of reboot of the device during a successful update. // The number of reboot of the device during a successful update.
optional int32 reboot_count = 7; optional int32 reboot_count = 7;
} }
/*
* Logs userspace reboot outcome and duration.
*
* Logged from:
* frameworks/base/core/java/com/android/server/BootReceiver.java
*/
message UserspaceRebootReported {
// Possible outcomes of userspace reboot.
enum Outcome {
// Default value in case platform failed to determine the outcome.
OUTCOME_UNKNOWN = 0;
// Userspace reboot succeeded (i.e. boot completed without a fall back to hard reboot).
SUCCESS = 1;
// Userspace reboot shutdown sequence was aborted.
FAILED_SHUTDOWN_SEQUENCE_ABORTED = 2;
// Remounting userdata into checkpointing mode failed.
FAILED_USERDATA_REMOUNT = 3;
// Device didn't finish booting before timeout and userspace reboot watchdog issued a hard
// reboot.
FAILED_USERSPACE_REBOOT_WATCHDOG_TRIGGERED = 4;
}
// Outcome of userspace reboot. Always set.
optional Outcome outcome = 1;
// Duration of userspace reboot in case it has a successful outcome.
// Duration is measured as time between userspace reboot was initiated and until boot completed
// (e.g. sys.boot_completed=1).
optional int64 duration_millis = 2;
// State of primary user's (user0) credential encryption storage.
enum UserEncryptionState {
// Default value.
USER_ENCRYPTION_STATE_UNKNOWN = 0;
// Credential encrypted storage is unlocked.
UNLOCKED = 1;
// Credential encrypted storage is locked.
LOCKED = 2;
}
// State of primary user's encryption storage at the moment boot completed. Always set.
optional UserEncryptionState user_encryption_state = 3;
}