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

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

Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev am: b172d5b4 

am: c96c65c6

Change-Id: I99400a09c15868058fdd4af67c85ace48b33c3bc
parents 4b0cffe0 c96c65c6

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -3083,10 +3083,10 @@ package android.net { 
  }



  public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {

    method public void addAddress(android.net.LinkAddress) throws java.io.IOException;

    method public void addAddress(java.net.InetAddress, int) throws java.io.IOException;

    method public void close();

    method public java.lang.String getInterfaceName();

    method public void removeAddress(android.net.LinkAddress) throws java.io.IOException;

    method public void removeAddress(java.net.InetAddress, int) throws java.io.IOException;

  }



  public final class IpSecTransform implements java.lang.AutoCloseable {

core/java/android/net/IpSecManager.java

+6 −4
Original line number Diff line number Diff line
@@ -690,14 +690,15 @@ public final class IpSecManager { 
         * tunneled traffic.

         *

         * @param address the local address for traffic inside the tunnel

         * @param prefixLen length of the InetAddress prefix

         * @hide

         */

        @SystemApi

        @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)

        public void addAddress(@NonNull LinkAddress address) throws IOException {

        public void addAddress(@NonNull InetAddress address, int prefixLen) throws IOException {

            try {

                mService.addAddressToTunnelInterface(

                        mResourceId, address, mOpPackageName);

                        mResourceId, new LinkAddress(address, prefixLen), mOpPackageName);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }
@@ -709,14 +710,15 @@ public final class IpSecManager { 
         * <p>Remove an address which was previously added to the IpSecTunnelInterface

         *

         * @param address to be removed

         * @param prefixLen length of the InetAddress prefix

         * @hide

         */

        @SystemApi

        @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)

        public void removeAddress(@NonNull LinkAddress address) throws IOException {

        public void removeAddress(@NonNull InetAddress address, int prefixLen) throws IOException {

            try {

                mService.removeAddressFromTunnelInterface(

                        mResourceId, address, mOpPackageName);

                        mResourceId, new LinkAddress(address, prefixLen), mOpPackageName);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

            }

tests/net/java/android/net/IpSecManagerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -288,12 +288,14 @@ public class IpSecManagerTest { 
        IpSecManager.IpSecTunnelInterface tunnelIntf =

                createAndValidateVti(DUMMY_RESOURCE_ID, VTI_INTF_NAME);



        tunnelIntf.addAddress(VTI_INNER_ADDRESS);

        tunnelIntf.addAddress(VTI_INNER_ADDRESS.getAddress(),

                VTI_INNER_ADDRESS.getPrefixLength());

        verify(mMockIpSecService)

                .addAddressToTunnelInterface(

                        eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS), anyString());



        tunnelIntf.removeAddress(VTI_INNER_ADDRESS);

        tunnelIntf.removeAddress(VTI_INNER_ADDRESS.getAddress(),

                VTI_INNER_ADDRESS.getPrefixLength());

        verify(mMockIpSecService)

                .addAddressToTunnelInterface(

                        eq(DUMMY_RESOURCE_ID), eq(VTI_INNER_ADDRESS), anyString());