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

Commit 189292cc authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge "Expose add/removeAddress for IpSecInterfaces" 

am: 8e2b079f

Change-Id: Ia04b3bea771d0939cd33becfd792166df38ad0d6
parents bb85d80a 8e2b079f

api/system-current.txt

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

  }





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

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

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

    method public void close();

    method public void close();

    method public java.lang.String getInterfaceName();

    method public java.lang.String getInterfaceName();

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

  }

  }





  public final class IpSecTransform implements java.lang.AutoCloseable {

  public final class IpSecTransform implements java.lang.AutoCloseable {

core/java/android/net/IpSecManager.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -658,7 +658,8 @@ public final class IpSecManager { 
         * @param address the local address for traffic inside the tunnel

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

         * @hide

         * @hide

         */

         */

        public void addAddress(LinkAddress address) {

        @SystemApi

        public void addAddress(LinkAddress address) throws IOException {

            try {

            try {

                mService.addAddressToTunnelInterface(mResourceId, address);

                mService.addAddressToTunnelInterface(mResourceId, address);

            } catch (RemoteException e) {

            } catch (RemoteException e) {
@@ -674,7 +675,8 @@ public final class IpSecManager { 
         * @param address to be removed

         * @param address to be removed

         * @hide

         * @hide

         */

         */

        public void removeAddress(LinkAddress address) {

        @SystemApi

        public void removeAddress(LinkAddress address) throws IOException {

            try {

            try {

                mService.removeAddressFromTunnelInterface(mResourceId, address);

                mService.removeAddressFromTunnelInterface(mResourceId, address);

            } catch (RemoteException e) {

            } catch (RemoteException e) {