diff options
| author | Rubin Xu <rubinxu@google.com> | 2021-05-11 09:31:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-11 09:31:51 +0000 |
| commit | c91f0da4fd9a40e224b42d11bb520e406719549f (patch) | |
| tree | 342824dadbd952dcbfcd9940fc640d9cc7eee8ca /core/java/android | |
| parent | f6bb9a20504126b4ec599bbc7e9b4e10faf37b91 (diff) | |
| parent | b59d8e1e21eaa426d23554146ab7756ca8a06ccf (diff) | |
Merge "Update SecurityLog javadoc" into sc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/SecurityLog.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/admin/SecurityLog.java b/core/java/android/app/admin/SecurityLog.java index 1cf45670ed93..8c59982f4058 100644 --- a/core/java/android/app/admin/SecurityLog.java +++ b/core/java/android/app/admin/SecurityLog.java @@ -189,6 +189,7 @@ public class SecurityLog { * detected. * <li> {@code eio} indicates that an I/O error will be returned for an attempt to read * corrupted data blocks. + * <li> {@code disabled} indicates that integrity check is disabled. * For details see Verified Boot documentation. */ public static final int TAG_OS_STARTUP = SecurityLogTags.SECURITY_OS_STARTUP; @@ -344,7 +345,7 @@ public class SecurityLog { public static final int TAG_WIPE_FAILURE = SecurityLogTags.SECURITY_WIPE_FAILED; /** - * Indicates that an authentication key was generated. The log entry contains the following + * Indicates that a cryptographic key was generated. The log entry contains the following * information about the event, encapsulated in an {@link Object} array and accessible via * {@link SecurityEvent#getData()}: * <li> [0] result ({@code Integer}, 0 if operation failed, 1 if succeeded) |