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

Commit 1785e062 authored by evitayan's avatar evitayan
Browse files

IKE Session API changes in setting CA cert and retrieving vendor ID 

This commit:
  - makes serverCaCert @Nullable
  - adds interface to retrieve vendor ID of the remote server

Bug: 145276978
Bug: 146168441
Test: atest FrameworksIkeTests(all passed)
Test: make update-api && make
Change-Id: If55a0a70c99a98287933a6d134413ab1329ff402
parent 7dd731a1

api/system-current.txt

+5 −4
Original line number Diff line number Diff line
@@ -4626,6 +4626,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
@@ -4645,9 +4646,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);
@@ -4665,7 +4666,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 {