Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the java doc" am: b7e998e235

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057431

Change-Id: I2189769065eaef8ee864b72601388836fc85fada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-04-11 03:22:41 +00:00
committed by Automerger Merge Worker
parent 32910d0da9 b7e998e235
commit a076a5ee40
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/net/Ikev2VpnProfile.java
View File

@@ -824,9 +824,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
* authentication method may be set. This method will overwrite any previously set
* authentication method.
*
* <p>It's not allowed to set this if this {@link Builder} is constructed from an
* {@link IkeTunnelConnectionParams}. This information should be retrieved from
* {@link IkeTunnelConnectionParams}
* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
* authentication details should be configured there, and calling this method will result
* in an exception being thrown.
*
* @param user the username to be used for EAP-MSCHAPv2 authentication
* @param pass the password to be used for EAP-MSCHAPv2 authentication
@@ -864,9 +864,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
* Only one authentication method may be set. This method will overwrite any previously set
* authentication method.
*
* <p>It's not allowed to set this if this {@link Builder} is constructed from an
* {@link IkeTunnelConnectionParams}. This information should be retrieved from
* {@link IkeTunnelConnectionParams}
* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
* authentication details should be configured there, and calling this method will result in
* an exception being thrown.
*
* @param userCert the username to be used for RSA Digital signiture authentication
* @param key the PrivateKey instance associated with the user ceritificate, used for
@@ -906,9 +906,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
* authentication method may be set. This method will overwrite any previously set
* authentication method.
*
* <p>It's not allowed to set this if this {@link Builder} is constructed from an
* {@link IkeTunnelConnectionParams}. This information should be retrieved from
* {@link IkeTunnelConnectionParams}
* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
* authentication details should be configured there, and calling this method will result in
* an exception being thrown.
*
* @param psk the key to be used for Pre-Shared Key authentication
* @return this {@link Builder} object to facilitate chaining of method calls
@@ -1042,9 +1042,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
* Authentication, and one that provides Encryption. Authenticated Encryption with
* Associated Data (AEAD) algorithms provide both Authentication and Encryption.
*
* <p>It's not allowed to set this if this {@link Builder} is constructed from an
* {@link IkeTunnelConnectionParams}. This information should be retrieved from
* {@link IkeTunnelConnectionParams}
* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
* authentication details should be configured there, and calling this method will result in
* an exception being thrown.
*
* <p>By default, this profile will use any algorithm defined in {@link IpSecAlgorithm},
* with the exception of those considered insecure (as described above).