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

Commit 3ad94d29 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev 

am: 74eb4a52

Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075
parents 54224d40 74eb4a52

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

+13 −13
Original line number Original line Diff line number Diff line
@@ -1315,7 +1315,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current minimum password quality for a particular admin or all admins that set

     * Retrieve the current minimum password quality for a particular admin or all admins that set

     * retrictions on this user and its participating profiles. Restrictions on profiles that have

     * restrictions on this user and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     *

     *

     * <p>This method can be called on the {@link DevicePolicyManager} instance

     * <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -1379,7 +1379,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current minimum password length for a particular admin or all admins that set

     * Retrieve the current minimum password length for a particular admin or all admins that set

     * retrictions on this user and its participating profiles. Restrictions on profiles that have

     * restrictions on this user and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     *

     *

     * <p>This method can be called on the {@link DevicePolicyManager} instance

     * <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -1442,7 +1442,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of upper case letters required in the password

     * Retrieve the current number of upper case letters required in the password

     * for a particular admin or all admins that set retrictions on this user and

     * for a particular admin or all admins that set restrictions on this user and

     * its participating profiles. Restrictions on profiles that have a separate challenge

     * its participating profiles. Restrictions on profiles that have a separate challenge

     * are not taken into account.

     * are not taken into account.

     * This is the same value as set by

     * This is the same value as set by
@@ -1511,7 +1511,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of lower case letters required in the password

     * Retrieve the current number of lower case letters required in the password

     * for a particular admin or all admins that set retrictions on this user

     * for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have

     * and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     * This is the same value as set by

     * This is the same value as set by
@@ -1580,7 +1580,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of letters required in the password

     * Retrieve the current number of letters required in the password

     * for a particular admin or all admins that set retrictions on this user

     * for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have

     * and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     * This is the same value as set by

     * This is the same value as set by
@@ -1648,7 +1648,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of numerical digits required in the password

     * Retrieve the current number of numerical digits required in the password

     * for a particular admin or all admins that set retrictions on this user

     * for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have

     * and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     * This is the same value as set by

     * This is the same value as set by
@@ -1716,7 +1716,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of symbols required in the password

     * Retrieve the current number of symbols required in the password

     * for a particular admin or all admins that set retrictions on this user

     * for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have

     * and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account. This is the same value as

     * a separate challenge are not taken into account. This is the same value as

     * set by {@link #setPasswordMinimumSymbols(ComponentName, int)}

     * set by {@link #setPasswordMinimumSymbols(ComponentName, int)}
@@ -1783,7 +1783,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current number of non-letter characters required in the password

     * Retrieve the current number of non-letter characters required in the password

     * for a particular admin or all admins that set retrictions on this user

     * for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have

     * and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     * This is the same value as set by

     * This is the same value as set by
@@ -1915,7 +1915,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Get the current password expiration time for a particular admin or all admins that set

     * Get the current password expiration time for a particular admin or all admins that set

     * retrictions on this user and its participating profiles. Restrictions on profiles that have

     * restrictions on this user and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account. If admin is {@code null}, then a composite

     * a separate challenge are not taken into account. If admin is {@code null}, then a composite

     * of all expiration times is returned - which will be the minimum of all of them.

     * of all expiration times is returned - which will be the minimum of all of them.

     *

     *
@@ -1939,7 +1939,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current password history length for a particular admin or all admins that

     * Retrieve the current password history length for a particular admin or all admins that

     * set retrictions on this user and its participating profiles. Restrictions on profiles that

     * set restrictions on this user and its participating profiles. Restrictions on profiles that

     * have a separate challenge are not taken into account.

     * have a separate challenge are not taken into account.

     *

     *

     * <p>This method can be called on the {@link DevicePolicyManager} instance

     * <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -2121,7 +2121,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current maximum number of login attempts that are allowed before the device

     * Retrieve the current maximum number of login attempts that are allowed before the device

     * or profile is wiped, for a particular admin or all admins that set retrictions on this user

     * or profile is wiped, for a particular admin or all admins that set restrictions on this user

     * and its participating profiles. Restrictions on profiles that have a separate challenge are

     * and its participating profiles. Restrictions on profiles that have a separate challenge are

     * not taken into account.

     * not taken into account.

     *

     *
@@ -2262,7 +2262,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Retrieve the current maximum time to unlock for a particular admin or all admins that set

     * Retrieve the current maximum time to unlock for a particular admin or all admins that set

     * retrictions on this user and its participating profiles. Restrictions on profiles that have

     * restrictions on this user and its participating profiles. Restrictions on profiles that have

     * a separate challenge are not taken into account.

     * a separate challenge are not taken into account.

     *

     *

     * <p>This method can be called on the {@link DevicePolicyManager} instance

     * <p>This method can be called on the {@link DevicePolicyManager} instance
@@ -3348,7 +3348,7 @@ public class DevicePolicyManager { 




    /**

    /**

     * Determine whether or not features have been disabled in keyguard either by the calling

     * Determine whether or not features have been disabled in keyguard either by the calling

     * admin, if specified, or all admins that set retrictions on this user and its participating

     * admin, if specified, or all admins that set restrictions on this user and its participating

     * profiles. Restrictions on profiles that have a separate challenge are not taken into account.

     * profiles. Restrictions on profiles that have a separate challenge are not taken into account.

     *

     *

     * <p>This method can be called on the {@link DevicePolicyManager} instance

     * <p>This method can be called on the {@link DevicePolicyManager} instance