Merge "Expose applyTunnelModeTransform as a system API"

This commit is contained in:
Benedict Wong
2018-01-24 01:42:30 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 1 deletions

View File

@@ -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;
}

View File

@@ -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
}