summaryrefslogtreecommitdiffstats
path: root/keystore/java/android/security/KeyStoreParameter.java
diff options
context:
space:
mode:
authorRobert Ly <robertly@google.com>2014-06-10 02:44:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-10 02:44:08 +0000
commita7ddd0292420c2e8869e093d8bdad5cdc1f199cc (patch)
treead2c49822c614b4719c394151f487d80090e2002 /keystore/java/android/security/KeyStoreParameter.java
parente5a28d34f662c469f85590dda28fc02eca12204b (diff)
parent80e84e2db92ba190c6c517dd4c71cd12c0adb249 (diff)
downloadframeworks_base-a7ddd0292420c2e8869e093d8bdad5cdc1f199cc.zip
frameworks_base-a7ddd0292420c2e8869e093d8bdad5cdc1f199cc.tar.gz
frameworks_base-a7ddd0292420c2e8869e093d8bdad5cdc1f199cc.tar.bz2
am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249': Add documentation for AndroidKeyStore
Diffstat (limited to 'keystore/java/android/security/KeyStoreParameter.java')
-rw-r--r--keystore/java/android/security/KeyStoreParameter.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStoreParameter.java b/keystore/java/android/security/KeyStoreParameter.java
index 621a605..fb5c859 100644
--- a/keystore/java/android/security/KeyStoreParameter.java
+++ b/keystore/java/android/security/KeyStoreParameter.java
@@ -27,7 +27,7 @@ import java.security.cert.Certificate;
/**
* This provides the optional parameters that can be specified for
* {@code KeyStore} entries that work with
- * <a href="{@docRoot}guide/topics/security/keystore.html">Android KeyStore
+ * <a href="{@docRoot}training/articles/keystore.html">Android KeyStore
* facility</a>. The Android KeyStore facility is accessed through a
* {@link java.security.KeyStore} API using the {@code AndroidKeyStore}
* provider. The {@code context} passed in may be used to pop up some UI to ask
@@ -70,7 +70,7 @@ public final class KeyStoreParameter implements ProtectionParameter {
* Builder class for {@link KeyStoreParameter} objects.
* <p>
* This will build protection parameters for use with the
- * <a href="{@docRoot}guide/topics/security/keystore.html">Android KeyStore
+ * <a href="{@docRoot}training/articles/keystore.html">Android KeyStore
* facility</a>.
* <p>
* This can be used to require that KeyStore entries be stored encrypted.