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

Commit 39f7d4f1 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Child Session API changes in configuring and retrieving internal address am:... 

Child Session API changes in configuring and retrieving internal address am: 7dd731a1 am: bd4856ae

Change-Id: Ic19900e185443772a7b0a2627296d9cfe80ab0b0
parents f0225870 bd4856ae

api/system-current.txt

+3 −11
Original line number Diff line number Diff line
@@ -4583,7 +4583,7 @@ package android.net.ipsec.ike { 
    method @NonNull public java.util.List<android.net.LinkAddress> getInternalAddresses();

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

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

    method @NonNull public java.util.List<android.net.LinkAddress> getInternalSubnets();

    method @NonNull public java.util.List<android.net.IpPrefix> getInternalSubnets();

    method @NonNull public java.util.List<android.net.ipsec.ike.IkeTrafficSelector> getOutboundTrafficSelectors();

  }










@@ -4755,12 +4755,10 @@ package android.net.ipsec.ike {













    ctor public TunnelModeChildSessionParams.Builder();















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalAddressRequest(int);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalAddressRequest(@NonNull java.net.InetAddress, int);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalAddressRequest(@NonNull java.net.Inet4Address);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalAddressRequest(@NonNull java.net.Inet6Address, int);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalDhcpServerRequest(int);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalDhcpServerRequest(@NonNull java.net.InetAddress);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalDnsServerRequest(int);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalDnsServerRequest(@NonNull java.net.InetAddress);













    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addInternalSubnetRequest(int);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addOutboundTrafficSelectors(@NonNull android.net.ipsec.ike.IkeTrafficSelector);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams.Builder addSaProposal(@NonNull android.net.ipsec.ike.ChildSaProposal);















    method @NonNull public android.net.ipsec.ike.TunnelModeChildSessionParams build();









@@ -4784,9 +4782,6 @@ package android.net.ipsec.ike {













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















  }



























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













  }



























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















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















    method public int getPrefixLength();









@@ -4796,9 +4791,6 @@ package android.net.ipsec.ike {













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















  }



























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













  }



























}





























package android.net.ipsec.ike.exceptions {