diff options
| author | Robert Ly <robertly@google.com> | 2014-06-10 02:39:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 02:39:28 +0000 |
| commit | 80e84e2db92ba190c6c517dd4c71cd12c0adb249 (patch) | |
| tree | 9ca44998acd120769b2bbfc8508311ec129a20f0 /keystore/java | |
| parent | 20c5ce50c456742bf912ebb915be45bfdb51487d (diff) | |
| parent | f3cecfa2185ef5622992b21da8204b8b6590ef2d (diff) | |
| download | frameworks_base-80e84e2db92ba190c6c517dd4c71cd12c0adb249.zip frameworks_base-80e84e2db92ba190c6c517dd4c71cd12c0adb249.tar.gz frameworks_base-80e84e2db92ba190c6c517dd4c71cd12c0adb249.tar.bz2 | |
am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
Add documentation for AndroidKeyStore
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyPairGeneratorSpec.java | 4 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreParameter.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/keystore/java/android/security/KeyPairGeneratorSpec.java b/keystore/java/android/security/KeyPairGeneratorSpec.java index 21d6caa..4a823cc 100644 --- a/keystore/java/android/security/KeyPairGeneratorSpec.java +++ b/keystore/java/android/security/KeyPairGeneratorSpec.java @@ -35,7 +35,7 @@ import javax.security.auth.x500.X500Principal; /** * This provides the required parameters needed for initializing the * {@code KeyPairGenerator} that works 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.KeyPairGenerator} API using the {@code AndroidKeyStore} * provider. The {@code context} passed in may be used to pop up some UI to ask @@ -306,7 +306,7 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { * Builder class for {@link KeyPairGeneratorSpec} objects. * <p> * This will build a parameter spec for use with the <a href="{@docRoot} - * guide/topics/security/keystore.html">Android KeyStore facility</a>. + * training/articles/keystore.html">Android KeyStore facility</a>. * <p> * The required fields must be filled in with the builder. * <p> 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. |