Merge "Expose API for requesting, and retrieving P_CSCF addresses" am:... (3bc542d9) · Commits · e / os / android_frameworks_base

api/system-current.txt

+25 −11

Original line number	Diff line number	Diff line
		@@ -6790,7 +6790,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);
		@@ -6799,6 +6799,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();
		@@ -6812,6 +6813,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);
		@@ -6825,6 +6828,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 {
		}

		@@ -6846,6 +6857,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;
		@@ -6893,7 +6907,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 {
		@@ -6910,33 +6924,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 {