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

Commit cfa8785e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Docs: small documentation fixes for formatting and typos."

parents 751cbc64 edbc4c47

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -2858,8 +2858,8 @@ public class DevicePolicyManager { 
     * When called by a profile owner of a managed profile returns true if the profile uses unified

     * challenge with its parent user.

     *

     * <strong>Note: This method is not concerned with password quality and will return false if

     * the profile has empty password as a separate challenge.

     * <strong>Note</strong>: This method is not concerned with password quality and will return

     * false if the profile has empty password as a separate challenge.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @throws SecurityException if {@code admin} is not a profile owner of a managed profile.

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

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ public class SecurityLog { 
     * <li> [1] admin user ID ({@code Integer})

     * <li> [2] target user ID ({@code Integer})

     * <li> [3] new maximum number of failed password attempts ({@code Integer})

     * @see DevicePolicyManager#setMaximumTimeToLock(ComponentName, long)

     * @see DevicePolicyManager#setMaximumFailedPasswordsForWipe(ComponentName, int)

     */

    public static final int TAG_MAX_PASSWORD_ATTEMPTS_SET =

            SecurityLogTags.SECURITY_MAX_PASSWORD_ATTEMPTS_SET;
@@ -370,7 +370,7 @@ public class SecurityLog { 
            SecurityLogTags.SECURITY_CERT_AUTHORITY_INSTALLED;



    /**

     * Indicates that a new oot certificate has been removed from system's trusted credential

     * Indicates that a new root certificate has been removed from system's trusted credential

     * storage. 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)