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

Commit 8f5a9fa9 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topics "api-address", "api-change-ike" am: bedcf85e am:... 

Merge changes from topics "api-address", "api-change-ike" am: bedcf85e am: f3f23c9b am: 702d1e27

Change-Id: Ie0f9bb0e7da1a6e03288fb3e65e7572a56087714
parents 16409d72 702d1e27

api/system-current.txt

+5 −4
Original line number Diff line number Diff line
@@ -4961,6 +4961,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
@@ -4980,9 +4981,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);
@@ -5000,7 +5001,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 {