Merge "Hide Socket+DatagramSocket IpSecTransform methods" into oc-dev (fca728da) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -25517,13 +25517,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;

api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -27706,13 +27706,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;

api/test-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -25624,13 +25624,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;

core/java/android/net/IpSecManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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 {