Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c2253ff48d

Change-Id: I85c761df4b77dba0b62adfd3488f66cdcf780fa3
This commit is contained in:
Benedict Wong
2018-01-24 02:50:47 +00:00
committed by android-build-merger
parent 083022a701 c2253ff48d
commit 9aaff41725
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
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;
}

2
core/java/android/net/IpSecManager.java
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
}