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

Commit 0bb5bf87 authored by Benedict Wong's avatar Benedict Wong Committed by android-build-merger
Browse files

Merge "Expose API for requesting, and retrieving P_CSCF addresses" 

am: 33a436e3

Change-Id: I08465fa8a4d6ac5422e5d470ae7a49686c707ab8
parents 1ebbd0bb 33a436e3

api/system-current.txt

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

  }

















  public final class IkeSessionConfiguration {







  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 String getRemoteApplicationVersion();











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







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











    method public boolean isIkeExtensionEnabled(int);







    method public boolean isIkeExtensionEnabled(int);









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









  }







  }



























  public final class IkeSessionParams {







  public final class IkeSessionParams {














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











    method public long getHardLifetime();







    method public long getHardLifetime();











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







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











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







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









@@ -4923,6 +4924,8 @@ package android.net.ipsec.ike {

























  public static final class IkeSessionParams.Builder {







  public static final class IkeSessionParams.Builder {











    ctor public 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.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 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);







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









@@ -4936,6 +4939,14 @@ package android.net.ipsec.ike {









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







    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 {







  public abstract static class IkeSessionParams.IkeAuthConfig {











  }







  }

























@@ -4957,6 +4968,9 @@ package android.net.ipsec.ike {









    method @NonNull public byte[] getPsk();







    method @NonNull public byte[] getPsk();











  }







  }






























  public static interface IkeSessionParams.IkeConfigRequest {














  }
























  public final class IkeTrafficSelector {







  public final class IkeTrafficSelector {











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







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











    field public final int endPort;







    field public final int endPort;










@@ -5004,7 +5018,7 @@ package android.net.ipsec.ike {









  }







  }



























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







  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 {







  public static final class TunnelModeChildSessionParams.Builder {









@@ -5021,33 +5035,33 @@ package android.net.ipsec.ike {









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







    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.TunnelModeChildConfigRequest {











  }



























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














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







    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();







    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();







    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 @Nullable public java.net.Inet6Address getAddress();











    method public int getPrefixLength();







    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();







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











  }







  }






























  public static interface TunnelModeChildSessionParams.TunnelModeChildConfigRequest {














  }
























}







}



























package android.net.ipsec.ike.exceptions {







package android.net.ipsec.ike.exceptions {