Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf1e784 authored by Rubin Xu's avatar Rubin Xu Committed by Automerger Merge Worker
Browse files

Merge "Update SecurityLog javadoc" into sc-dev am: c91f0da4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14487856

Change-Id: I9f5e97c23a58c96d5fc927b2a327d077db48aa11
parents 726acfa8 c91f0da4

core/java/android/app/admin/SecurityLog.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -189,6 +189,7 @@ public class SecurityLog { 
     * detected.

     * detected.

     * <li> {@code eio} indicates that an I/O error will be returned for an attempt to read

     * <li> {@code eio} indicates that an I/O error will be returned for an attempt to read

     * corrupted data blocks.

     * corrupted data blocks.

     * <li> {@code disabled} indicates that integrity check is disabled.

     * For details see Verified Boot documentation.

     * For details see Verified Boot documentation.

     */

     */

    public static final int TAG_OS_STARTUP = SecurityLogTags.SECURITY_OS_STARTUP;

    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;

    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

     * information about the event, encapsulated in an {@link Object} array and accessible via

     * {@link SecurityEvent#getData()}:

     * {@link SecurityEvent#getData()}:

     * <li> [0] result ({@code Integer}, 0 if operation failed, 1 if succeeded)

     * <li> [0] result ({@code Integer}, 0 if operation failed, 1 if succeeded)