Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expose IKE module API: Session Options & EapSessionConfig

Browse Source 
This commit updates system-current to expose APIs including:
- EapSessionConfig
- IkeSessionOptions
- ChildSessionOptions and its subclasses

Bug: 143983419
Test: make update-api && make
Change-Id: Ia97f3e3d507930957260d165de251834b43b84ea
This commit is contained in:
evitayan
2019-11-11 18:11:59 -08:00
committed by Benedict Wong
parent c4a5883fc5
commit 39202c84a1
1 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
api/system-current.txt
View File

@@ -4273,6 +4273,48 @@ package android.net.apf {
} }
package android.net.eap {
public final class EapSessionConfig {
}
public static final class EapSessionConfig.Builder {
ctor public EapSessionConfig.Builder();
method @NonNull public android.net.eap.EapSessionConfig build();
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapAkaConfig(int, int);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapAkaPrimeConfig(int, int, @NonNull String, boolean);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapIdentity(@NonNull byte[]);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapMsChapV2Config(@NonNull String, @NonNull String);
method @NonNull public android.net.eap.EapSessionConfig.Builder setEapSimConfig(int, int);
}
public static class EapSessionConfig.EapAkaConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
}
public static class EapSessionConfig.EapAkaPrimeConfig extends android.net.eap.EapSessionConfig.EapAkaConfig {
method public boolean allowsMismatchedNetworkNames();
method @NonNull public String getNetworkName();
}
public abstract static class EapSessionConfig.EapMethodConfig {
method public int getMethodType();
}
public static class EapSessionConfig.EapMsChapV2Config extends android.net.eap.EapSessionConfig.EapMethodConfig {
method @NonNull public String getPassword();
method @NonNull public String getUsername();
}
public static class EapSessionConfig.EapSimConfig extends android.net.eap.EapSessionConfig.EapUiccConfig {
}
public abstract static class EapSessionConfig.EapUiccConfig extends android.net.eap.EapSessionConfig.EapMethodConfig {
method public int getAppType();
method public int getSubId();
}
}
package android.net.ipsec.ike { package android.net.ipsec.ike {
public final class ChildSaProposal extends android.net.ipsec.ike.SaProposal { public final class ChildSaProposal extends android.net.ipsec.ike.SaProposal {
@@ -4303,6 +4345,9 @@ package android.net.ipsec.ike {
method @NonNull public java.util.List<android.net.ipsec.ike.IkeTrafficSelector> getOutboundTrafficSelectors(); method @NonNull public java.util.List<android.net.ipsec.ike.IkeTrafficSelector> getOutboundTrafficSelectors();
} }
public abstract class ChildSessionOptions {
}
public class IkeFqdnIdentification extends android.net.ipsec.ike.IkeIdentification { public class IkeFqdnIdentification extends android.net.ipsec.ike.IkeIdentification {
ctor public IkeFqdnIdentification(@NonNull String); ctor public IkeFqdnIdentification(@NonNull String);
field @NonNull public final String fqdn; field @NonNull public final String fqdn;
@@ -4359,6 +4404,23 @@ package android.net.ipsec.ike {
field public static final int EXTENSION_TYPE_MOBIKE = 2; // 0x2 field public static final int EXTENSION_TYPE_MOBIKE = 2; // 0x2
} }
public final class IkeSessionOptions {
}
public static final class IkeSessionOptions.Builder {
ctor public IkeSessionOptions.Builder();
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder addSaProposal(@NonNull android.net.ipsec.ike.IkeSaProposal);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions build();
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setAuthDigitalSignature(@NonNull java.security.cert.X509Certificate, @NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.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.IkeSessionOptions.Builder setAuthEap(@NonNull java.security.cert.X509Certificate, @NonNull android.net.eap.EapSessionConfig);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setAuthPsk(@NonNull byte[]);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setLocalIdentification(@NonNull android.net.ipsec.ike.IkeIdentification);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setRemoteIdentification(@NonNull android.net.ipsec.ike.IkeIdentification);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setServerAddress(@NonNull java.net.InetAddress);
method @NonNull public android.net.ipsec.ike.IkeSessionOptions.Builder setUdpEncapsulationSocket(@NonNull android.net.IpSecManager.UdpEncapsulationSocket);
}
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;
@@ -4393,6 +4455,35 @@ package android.net.ipsec.ike {
field public static final int PSEUDORANDOM_FUNCTION_HMAC_SHA1 = 2; // 0x2 field public static final int PSEUDORANDOM_FUNCTION_HMAC_SHA1 = 2; // 0x2
} }
public final class TransportModeChildSessionOptions extends android.net.ipsec.ike.ChildSessionOptions {
}
public static final class TransportModeChildSessionOptions.Builder {
ctor public TransportModeChildSessionOptions.Builder();
method @NonNull public android.net.ipsec.ike.TransportModeChildSessionOptions.Builder addInboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);
method @NonNull public android.net.ipsec.ike.TransportModeChildSessionOptions.Builder addOutboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);
method @NonNull public android.net.ipsec.ike.TransportModeChildSessionOptions.Builder addSaProposal(@NonNull android.net.ipsec.ike.ChildSaProposal);
method @NonNull public android.net.ipsec.ike.TransportModeChildSessionOptions build();
}
public final class TunnelModeChildSessionOptions extends android.net.ipsec.ike.ChildSessionOptions {
}
public static final class TunnelModeChildSessionOptions.Builder {
ctor public TunnelModeChildSessionOptions.Builder();
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalAddressRequest(int);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalAddressRequest(@NonNull java.net.InetAddress, int);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalDhcpServerRequest(int);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalDhcpServerRequest(@NonNull java.net.InetAddress);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalDnsServerRequest(int);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalDnsServerRequest(@NonNull java.net.InetAddress);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addInternalSubnetRequest(int);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addOutboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions.Builder addSaProposal(@NonNull android.net.ipsec.ike.ChildSaProposal);
method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionOptions build();
}
} }
package android.net.ipsec.ike.exceptions { package android.net.ipsec.ike.exceptions {