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

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

Merge "Expose applyTunnelModeTransform as a system API" am: d056f32b 

am: c2253ff4

Change-Id: I85c761df4b77dba0b62adfd3488f66cdcf780fa3
parents 083022a7 c2253ff4

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2578,6 +2578,7 @@ package android.net { 
  }



  public final class IpSecManager {

    method public void applyTunnelModeTransform(android.net.IpSecManager.IpSecTunnelInterface, int, android.net.IpSecTransform) throws java.io.IOException;

    method public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(java.net.InetAddress, java.net.InetAddress, android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;

  }

core/java/android/net/IpSecManager.java

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ public final class IpSecManager { 
     * @hide

     */

    @SystemApi

    void applyTunnelModeTransform(IpSecTunnelInterface tunnel, int direction,

    public void applyTunnelModeTransform(IpSecTunnelInterface tunnel, int direction,

            IpSecTransform transform) throws IOException {

        // TODO: call IpSecService

    }