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

Commit 7dd731a1 authored by evitayan's avatar evitayan
Browse files

Child Session API changes in configuring and retrieving internal address 

This commit:
- creates separate methods for requesting IPv4 and IPv6 internal
  address
- removes method to request internal subnet
- removes methods to request specific DNS and DHCP server
- uses IpPrefix to represent subnet

Bug: 145453636
Bug: 145454043
Bug: 145451419
Bug: 145454818
Test: atest FrameworksIkeTests(all passed)
Test: make update-api && make
Change-Id: Ic3fdccc12e7f2c361637e004e34b27e09d7900a0
parent 0bc81e1d

api/system-current.txt

+3 −11
Original line number Diff line number Diff line
@@ -4557,7 +4557,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();

  }










@@ -4729,12 +4729,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();









@@ -4758,9 +4756,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();









@@ -4770,9 +4765,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 {