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

Commit f3f23c9b authored by Yan Yan's avatar Yan Yan Committed by android-build-merger
Browse files

Merge changes from topics "api-address", "api-change-ike" 

am: bedcf85e

Change-Id: I42ab02f3c001638b90100123d667360ccd2849fa
parents bd4856ae bedcf85e

api/system-current.txt

+5 −4
Original line number Diff line number Diff line
@@ -4652,6 +4652,7 @@ package android.net.ipsec.ike { 
  public final class IkeSessionConfiguration {

    ctor public IkeSessionConfiguration();

    method @NonNull public String getRemoteApplicationVersion();

    method @NonNull public java.util.List<byte[]> getRemoteVendorIDs();

    method public boolean isIkeExtensionEnabled(int);

    field public static final int EXTENSION_TYPE_FRAGMENTATION = 1; // 0x1

    field public static final int EXTENSION_TYPE_MOBIKE = 2; // 0x2
@@ -4671,9 +4672,9 @@ package android.net.ipsec.ike { 
    ctor public IkeSessionParams.Builder();

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder addSaProposal(@NonNull android.net.ipsec.ike.IkeSaProposal);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams build();

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthDigitalSignature(@NonNull java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthDigitalSignature(@NonNull java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.util.List<java.security.cert.X509Certificate>, @NonNull java.security.PrivateKey);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthEap(@NonNull java.security.cert.X509Certificate, @NonNull android.net.eap.EapSessionConfig);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthDigitalSignature(@Nullable java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthDigitalSignature(@Nullable java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.util.List<java.security.cert.X509Certificate>, @NonNull java.security.PrivateKey);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthEap(@Nullable java.security.cert.X509Certificate, @NonNull android.net.eap.EapSessionConfig);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setAuthPsk(@NonNull byte[]);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setLocalIdentification(@NonNull android.net.ipsec.ike.IkeIdentification);

    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setRemoteIdentification(@NonNull android.net.ipsec.ike.IkeIdentification);
@@ -4691,7 +4692,7 @@ package android.net.ipsec.ike { 
  }















  public static class IkeSessionParams.IkeAuthDigitalSignRemoteConfig extends android.net.ipsec.ike.IkeSessionParams.IkeAuthConfig {













    method @NonNull public java.security.cert.X509Certificate getRemoteCaCert();













    method @Nullable public java.security.cert.X509Certificate getRemoteCaCert();















  }





























  public static class IkeSessionParams.IkeAuthEapConfig extends android.net.ipsec.ike.IkeSessionParams.IkeAuthConfig {