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

Commit 51cc143a authored by Benedict Wong's avatar Benedict Wong
Browse files

Expose API for requesting, and retrieving P_CSCF addresses 

This change exposes support for P_CSCF addresses in IKE negotiation.

Bug: 145996327
Test: Compiles, FrameworksIkeTests passing
Change-Id: I3ea624a0135eba2b4304148500a3acc5dfcc9afc
parent 77cfb615

api/system-current.txt

+25 −11
Original line number Diff line number Diff line
@@ -4833,7 +4833,7 @@ package android.net.ipsec.ike { 
  }















  public final class IkeSessionConfiguration {













    ctor public IkeSessionConfiguration();













    method @NonNull public java.util.List<java.net.InetAddress> getPcscfServers();















    method @NonNull public String getRemoteApplicationVersion();















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















    method public boolean isIkeExtensionEnabled(int);









@@ -4842,6 +4842,7 @@ package android.net.ipsec.ike {













  }





























  public final class IkeSessionParams {













    method @NonNull public java.util.List<android.net.ipsec.ike.IkeSessionParams.IkeConfigRequest> getConfigurationRequests();















    method public long getHardLifetime();















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















    method @NonNull public android.net.ipsec.ike.IkeIdentification getLocalIdentification();









@@ -4855,6 +4856,8 @@ package android.net.ipsec.ike {



























  public static final class IkeSessionParams.Builder {















    ctor public IkeSessionParams.Builder();













    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder addPcscfServerRequest(@NonNull java.net.InetAddress);













    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder addPcscfServerRequest(int);















    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(@Nullable java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey);









@@ -4868,6 +4871,14 @@ package android.net.ipsec.ike {













    method @NonNull public android.net.ipsec.ike.IkeSessionParams.Builder setUdpEncapsulationSocket(@NonNull android.net.IpSecManager.UdpEncapsulationSocket);















  }



























  public static interface IkeSessionParams.ConfigRequestIpv4PcscfServer extends android.net.ipsec.ike.IkeSessionParams.IkeConfigRequest {













    method @Nullable public java.net.Inet4Address getAddress();













  }

























  public static interface IkeSessionParams.ConfigRequestIpv6PcscfServer extends android.net.ipsec.ike.IkeSessionParams.IkeConfigRequest {













    method @Nullable public java.net.Inet6Address getAddress();













  }



























  public abstract static class IkeSessionParams.IkeAuthConfig {















  }























@@ -4889,6 +4900,9 @@ package android.net.ipsec.ike {













    method @NonNull public byte[] getPsk();















  }



























  public static interface IkeSessionParams.IkeConfigRequest {













  }



























  public final class IkeTrafficSelector {















    ctor public IkeTrafficSelector(int, int, @NonNull java.net.InetAddress, @NonNull java.net.InetAddress);















    field public final int endPort;










@@ -4936,7 +4950,7 @@ package android.net.ipsec.ike {













  }





























  public final class TunnelModeChildSessionParams extends android.net.ipsec.ike.ChildSessionParams {













    method @NonNull public java.util.List<android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest> getConfigurationRequests();













    method @NonNull public java.util.List<android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest> getConfigurationRequests();















  }





























  public static final class TunnelModeChildSessionParams.Builder {









@@ -4953,33 +4967,33 @@ package android.net.ipsec.ike {













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder setLifetime(long, long);















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequest {













  }

























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4Address extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4Address extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















    method @Nullable public java.net.Inet4Address getAddress();















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4DhcpServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4DhcpServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















    method @Nullable public java.net.Inet4Address getAddress();















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4DnsServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4DnsServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















    method @Nullable public java.net.Inet4Address getAddress();















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4Netmask extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv4Netmask extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv6Address extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv6Address extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















    method @Nullable public java.net.Inet6Address getAddress();















    method public int getPrefixLength();















  }



























  public static interface TunnelModeChildSessionParams.ConfigRequestIpv6DnsServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.ConfigRequest {













  public static interface TunnelModeChildSessionParams.ConfigRequestIpv6DnsServer extends android.net.ipsec.ike.TunnelModeChildSessionParams.TunnelModeChildConfigRequest {















    method @Nullable public java.net.Inet6Address getAddress();















  }



























  public static interface TunnelModeChildSessionParams.TunnelModeChildConfigRequest {













  }



























}





























package android.net.ipsec.ike.exceptions {