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

Commit 7465ff6f authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update the java doc" am: b7e998e2 am: a076a5ee am: 9df60ac1 am: dd859dc5 

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



Change-Id: I606fb37e1b0f283089354ccd05ae879752e6e287
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7896d516 dd859dc5

core/java/android/net/Ikev2VpnProfile.java

+12 −12
Original line number Original line Diff line number Diff line
@@ -824,9 +824,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
         * authentication method may be set. This method will overwrite any previously set

         * authentication method may be set. This method will overwrite any previously set

         * authentication method.

         * authentication method.

         *

         *

         * <p>It's not allowed to set this if this {@link Builder} is constructed from an

         * <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},

         * {@link IkeTunnelConnectionParams}. This information should be retrieved from

         * authentication details should be configured there, and calling this method will result

         * {@link IkeTunnelConnectionParams}

         * in an exception being thrown.

         *

         *

         * @param user the username to be used for EAP-MSCHAPv2 authentication

         * @param user the username to be used for EAP-MSCHAPv2 authentication

         * @param pass the password 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

         * Only one authentication method may be set. This method will overwrite any previously set

         * authentication method.

         * authentication method.

         *

         *

         * <p>It's not allowed to set this if this {@link Builder} is constructed from an

         * <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},

         * {@link IkeTunnelConnectionParams}. This information should be retrieved from

         * authentication details should be configured there, and calling this method will result in

         * {@link IkeTunnelConnectionParams}

         * an exception being thrown.

         *

         *

         * @param userCert the username to be used for RSA Digital signiture authentication

         * @param userCert the username to be used for RSA Digital signiture authentication

         * @param key the PrivateKey instance associated with the user ceritificate, used for

         * @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 may be set. This method will overwrite any previously set

         * authentication method.

         * authentication method.

         *

         *

         * <p>It's not allowed to set this if this {@link Builder} is constructed from an

         * <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},

         * {@link IkeTunnelConnectionParams}. This information should be retrieved from

         * authentication details should be configured there, and calling this method will result in

         * {@link IkeTunnelConnectionParams}

         * an exception being thrown.

         *

         *

         * @param psk the key to be used for Pre-Shared Key authentication

         * @param psk the key to be used for Pre-Shared Key authentication

         * @return this {@link Builder} object to facilitate chaining of method calls

         * @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

         * Authentication, and one that provides Encryption. Authenticated Encryption with

         * Associated Data (AEAD) algorithms provide both Authentication and Encryption.

         * 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

         * <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},

         * {@link IkeTunnelConnectionParams}. This information should be retrieved from

         * authentication details should be configured there, and calling this method will result in

         * {@link IkeTunnelConnectionParams}

         * an exception being thrown.

         *

         *

         * <p>By default, this profile will use any algorithm defined in {@link IpSecAlgorithm},

         * <p>By default, this profile will use any algorithm defined in {@link IpSecAlgorithm},

         * with the exception of those considered insecure (as described above).

         * with the exception of those considered insecure (as described above).