LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic 'ipsec-hide-overloads' am: fe358c6adf am: 8508bc52d2

Browse Source 
am: 6eab2ee093

Change-Id: Iaa713ba4b20bab12331bd996288ed2440c349db2
This commit is contained in:
nharold
2017-04-18 22:12:54 +00:00
committed by android-build-merger
parent 31af88727b 4b909c85f6
commit d19fe145b9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/net/IpSecManager.java
View File

@@ -245,6 +245,7 @@ public final class IpSecManager {
* *
* @param socket a stream socket * @param socket a stream socket
* @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.
* @hide
*/ */
public void applyTransportModeTransform(Socket socket, IpSecTransform transform) public void applyTransportModeTransform(Socket socket, IpSecTransform transform)
throws IOException { throws IOException {
@@ -262,6 +263,7 @@ public final class IpSecManager {
* *
* @param socket a datagram socket * @param socket a datagram socket
* @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. * @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.
* @hide
*/ */
public void applyTransportModeTransform(DatagramSocket socket, IpSecTransform transform) public void applyTransportModeTransform(DatagramSocket socket, IpSecTransform transform)
throws IOException { throws IOException {
@@ -284,7 +286,7 @@ public final class IpSecManager {
* address associated with that transform will throw an IOException. In addition, if the * 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 * 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 * 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 socket a socket file descriptor
* @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform. * @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 socket a socket that previously had a transform applied to it.
* @param transform the IPsec Transform that was previously applied to the given socket * @param transform the IPsec Transform that was previously applied to the given socket
* @hide
*/ */
public void removeTransportModeTransform(Socket socket, IpSecTransform transform) public void removeTransportModeTransform(Socket socket, IpSecTransform transform)
throws IOException { throws IOException {
@@ -331,6 +334,7 @@ public final class IpSecManager {
* *
* @param socket a socket that previously had a transform applied to it. * @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 * @param transform the IPsec Transform that was previously applied to the given socket
* @hide
*/ */
public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform) public void removeTransportModeTransform(DatagramSocket socket, IpSecTransform transform)
throws IOException { throws IOException {