summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2017-04-17 19:34:33 -0700
committerNathan Harold <nharold@google.com>2017-04-17 20:23:51 -0700
commit10f051ca91f352acea3ccd329da87db67012bd19 (patch)
treedeab01f0934738b772b37c8b74fd7023b82856e0 /core/java
parent05c7b5ad7cdba444db3d7813bf69da8f5d7f9058 (diff)
Hide Socket+DatagramSocket IpSecTransform methods
These methods do not currently work for IPv4 sockets, so they need to be hidden until the underlying kernel code can be made to work properly in a dual-stack environment. Bug: 36073210 Test: compilation Merged-In: Idce367f638a42da374a7f1dc5ebb8931c9555e06 Change-Id: Idce367f638a42da374a7f1dc5ebb8931c9555e06 (cherry picked from commit da18b028f85e9a2c969c636aea6abf7f4bac3922)
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/IpSecManager.java6
1 files changed, 5 insertions, 1 deletions
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 {