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

Commit f5558872 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android (Google) Code Review
Browse files

Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev

parents 8d7455fb 27dd1a22

keystore/java/android/security/KeyGeneratorSpec.java

+6 −4
Original line number Diff line number Diff line
@@ -195,10 +195,12 @@ public class KeyGeneratorSpec implements AlgorithmParameterSpec { 


    /**

     * Gets the duration of time (seconds) for which this key can be used after the user is

     * successfully authenticated.

     * successfully authenticated. This has effect only if user authentication is required.

     *

     * @return duration in seconds or {@code -1} if authentication is required for every use of the

     *         key.

     *

     * @return duration in seconds or {@code -1} if not restricted. {@code 0} means authentication

     *         is required for every use of the key.

     * @see #isUserAuthenticationRequired()

     */

    public int getUserAuthenticationValidityDurationSeconds() {

        return mUserAuthenticationValidityDurationSeconds;
@@ -426,7 +428,7 @@ public class KeyGeneratorSpec implements AlgorithmParameterSpec { 
         *

         * <p>By default, the user needs to authenticate for every use of the key.

         *

         * @param seconds duration in seconds or {@code 0} if the user needs to authenticate for

         * @param seconds duration in seconds or {@code -1} if the user needs to authenticate for

         *        every use of the key.

         *

         * @see #setUserAuthenticationRequired(boolean)

keystore/java/android/security/KeyPairGeneratorSpec.java

+5 −5
Original line number Diff line number Diff line
@@ -403,14 +403,14 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { 
    }



    /**

     * Gets the duration of time (seconds) for which the private key can be used after the user

     * is successfully authenticated.

     * Gets the duration of time (seconds) for which this key can be used after the user is

     * successfully authenticated. This has effect only if user authentication is required.

     *

     * <p>This restriction applies only to private key operations. Public key operations are not

     * restricted.

     *

     * @return duration in seconds or {@code -1} if not restricted. {@code 0} means authentication

     *         is required for every use of the key.

     * @return duration in seconds or {@code -1} if authentication is required for every use of the

     *         key.

     *

     * @see #isUserAuthenticationRequired()

     */
@@ -791,7 +791,7 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { 
         * <p>This restriction applies only to private key operations. Public key operations are not

         * restricted.

         *

         * @param seconds duration in seconds or {@code 0} if the user needs to authenticate for

         * @param seconds duration in seconds or {@code -1} if the user needs to authenticate for

         *        every use of the key.

         *

         * @see #setUserAuthenticationRequired(boolean)

keystore/java/android/security/KeyStoreKeySpec.java

+3 −3
Original line number Diff line number Diff line
@@ -179,10 +179,10 @@ public class KeyStoreKeySpec implements KeySpec { 


    /**

     * Gets the duration of time (seconds) for which this key can be used after the user is

     * successfully authenticated.

     * successfully authenticated. This has effect only if user authentication is required.

     *

     * @return duration in seconds or {@code -1} if not restricted. {@code 0} means authentication

     *         is required for every use of the key.

     * @return duration in seconds or {@code -1} if authentication is required for every use of the

     *         key.

     *

     * @see #isUserAuthenticationRequired()

     */

keystore/java/android/security/KeyStoreParameter.java

+6 −4
Original line number Diff line number Diff line
@@ -218,10 +218,12 @@ public final class KeyStoreParameter implements ProtectionParameter { 


    /**

     * Gets the duration of time (seconds) for which this key can be used after the user is

     * successfully authenticated.

     * successfully authenticated. This has effect only if user authentication is required.

     *

     * @return duration in seconds or {@code -1} if authentication is required for every use of the

     *         key.

     *

     * @return duration in seconds or {@code -1} if not restricted. {@code 0} means authentication

     *         is required for every use of the key.

     * @see #isUserAuthenticationRequired()

     */

    public int getUserAuthenticationValidityDurationSeconds() {

        return mUserAuthenticationValidityDurationSeconds;
@@ -464,7 +466,7 @@ public final class KeyStoreParameter implements ProtectionParameter { 
         *

         * <p>By default, the user needs to authenticate for every use of the key.

         *

         * @param seconds duration in seconds or {@code 0} if the user needs to authenticate for

         * @param seconds duration in seconds or {@code -1} if the user needs to authenticate for

         *        every use of the key.

         *

         * @see #setUserAuthenticationRequired(boolean)