summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyStoreKeySpec.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-05-07 17:34:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-07 17:34:25 +0000
commitf555887237665fd2cd16182e63dd7ff5f4b7e708 (patch)
tree1796f540064c7b96aa7d577c5d1e15d7b672ab7f /keystore/java/android/security/KeyStoreKeySpec.java
parent8d7455fbe406555034e1e6ecc8f99c7949467074 (diff)
parent27dd1a22275e92afed612655822438ab3df15356 (diff)
Merge "Adjust the Javadoc for user authentication timeout." into mnc-dev
Diffstat (limited to 'keystore/java/android/security/KeyStoreKeySpec.java')
-rw-r--r--keystore/java/android/security/KeyStoreKeySpec.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystore/java/android/security/KeyStoreKeySpec.java b/keystore/java/android/security/KeyStoreKeySpec.java
index 3e8448ac280f..7533bdc83279 100644
--- a/keystore/java/android/security/KeyStoreKeySpec.java
+++ b/keystore/java/android/security/KeyStoreKeySpec.java
@@ -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()
*/