diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/net/IpSecManager.java | 6 |
4 files changed, 5 insertions, 13 deletions
diff --git a/api/current.txt b/api/current.txt index 3cb870371db8..c34002ac8494 100644 --- a/api/current.txt +++ b/api/current.txt @@ -25559,13 +25559,9 @@ package android.net { } public final class IpSecManager { - method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; diff --git a/api/system-current.txt b/api/system-current.txt index 9e61bb83387c..d103ec9e87a2 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -27746,13 +27746,9 @@ package android.net { } public final class IpSecManager { - method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; diff --git a/api/test-current.txt b/api/test-current.txt index b3b414071b23..1f18ac7b4669 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -25666,13 +25666,9 @@ package android.net { } public final class IpSecManager { - method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void applyTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void applyTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException; - method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException; - method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform) throws java.io.IOException; method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform) throws java.io.IOException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException; method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException; diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java index 1a55b37665ce..375b7eeb013a 100644 --- a/core/java/android/net/IpSecManager.java +++ b/core/java/android/net/IpSecManager.java @@ -245,6 +245,7 @@ public final class IpSecManager { * * @param socket a stream socket * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. + * @hide */ public void applyTransportModeTransform(Socket socket, IpSecTransform transform) throws IOException { @@ -262,6 +263,7 @@ public final class IpSecManager { * * @param socket a datagram socket * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. + * @hide */ public void applyTransportModeTransform(DatagramSocket socket, IpSecTransform transform) throws IOException { @@ -284,7 +286,7 @@ public final class IpSecManager { * address associated with that transform will throw an IOException. In addition, if the * IpSecTransform is later deactivated, the socket will throw an IOException on any calls to * send() or receive() until the transform is removed from the socket by calling {@link - * #removeTransportModeTransform(Socket, IpSecTransform)}; + * #removeTransportModeTransform(FileDescriptor, IpSecTransform)}; * * @param socket a socket file descriptor * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. @@ -316,6 +318,7 @@ public final class IpSecManager { * * @param socket a socket that previously had a transform applied to it. * @param transform the IPsec Transform that was previously applied to the given socket + * @hide */ public void removeTransportModeTransform(Socket socket, IpSecTransform transform) throws IOException { @@ -331,6 +334,7 @@ public final class IpSecManager { * * @param socket a socket that previously had a transform applied to it. * @param transform the IPsec Transform that was previously applied to the given socket + * @hide */ public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform) throws IOException { |