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

Commit 45dcce7c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Expose add/removeAddress for IpSecInterfaces" am: 8e2b079f am:... 

Merge "Merge "Expose add/removeAddress for IpSecInterfaces" am: 8e2b079f am: 189292cc" into pi-dev-plus-aosp
parents 9079589e 763352f1

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -3035,8 +3035,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 close();

    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 {

core/java/android/net/IpSecManager.java

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

         * @hide

         */

        public void addAddress(LinkAddress address) {

        @SystemApi

        public void addAddress(LinkAddress address) throws IOException {

            try {

                mService.addAddressToTunnelInterface(mResourceId, address);

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

         * @hide

         */

        public void removeAddress(LinkAddress address) {

        @SystemApi

        public void removeAddress(LinkAddress address) throws IOException {

            try {

                mService.removeAddressFromTunnelInterface(mResourceId, address);

            } catch (RemoteException e) {