Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b (a237a340) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23896,10 +23896,12 @@ package android.net {
	public final class IpSecManager {		public final class IpSecManager {
	method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;		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.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(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 android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);
	method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);
			method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);
	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) 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;		method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
	field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25734,10 +25734,12 @@ package android.net {
	public final class IpSecManager {		public final class IpSecManager {
	method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;		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.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(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 android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);
	method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);
			method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);
	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) 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;		method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
	field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23970,10 +23970,12 @@ package android.net {
	public final class IpSecManager {		public final class IpSecManager {
	method public void applyTransportModeTransform(java.net.Socket, android.net.IpSecTransform) throws java.io.IOException;		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.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(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 android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.Socket, android.net.IpSecTransform);
	method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);		method public void removeTransportModeTransform(java.net.DatagramSocket, android.net.IpSecTransform);
			method public void removeTransportModeTransform(java.io.FileDescriptor, android.net.IpSecTransform);
	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) 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;		method public android.net.IpSecManager.SecurityParameterIndex reserveSecurityParameterIndex(int, java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
	field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0

core/java/android/net/IpSecManager.java

+31 −0

Original line number	Original line	Diff line number	Diff line
	@@ -277,6 +277,23 @@ public final class IpSecManager {
	}		}
	}		}

			/**
			* Apply an active Transport Mode IPsec Transform to a stream socket to perform IPsec
			* encapsulation of the traffic flowing between the socket and the remote InetAddress of that
			* transform. For security reasons, attempts to send traffic to any IP address other than 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
			* send() or receive() until the transform is removed from the socket by calling {@link
			* #removeTransportModeTransform(Socket, IpSecTransform)};
			*
			* @param socket a socket file descriptor
			* @param transform an {@link IpSecTransform}, which must be an active Transport Mode transform.
			*/
			public void applyTransportModeTransform(FileDescriptor socket, IpSecTransform transform)
			throws IOException {
			applyTransportModeTransform(new ParcelFileDescriptor(socket), transform);
			}

	/**		/**
	* Apply an active Tunnel Mode IPsec Transform to a network, which will tunnel all traffic to		* Apply an active Tunnel Mode IPsec Transform to a network, which will tunnel all traffic to
	* and from that network's interface with IPsec (applies an outer IP header and IPsec Header to		* and from that network's interface with IPsec (applies an outer IP header and IPsec Header to
	@@ -318,6 +335,20 @@ public final class IpSecManager {
	removeTransportModeTransform(ParcelFileDescriptor.fromDatagramSocket(socket), transform);		removeTransportModeTransform(ParcelFileDescriptor.fromDatagramSocket(socket), transform);
	}		}

			/**
			* Remove a transform from a given stream socket. Once removed, traffic on the socket will not
			* be encypted. This allows sockets that have been used for IPsec to be reclaimed for
			* communication in the clear in the event socket reuse is desired. This operation will succeed
			* regardless of the underlying state of a transform. If a transform is removed, communication
			* on all sockets to which that transform was applied will fail until this method is called.
			*
			* @param socket a socket file descriptor that previously had a transform applied to it.
			* @param transform the IPsec Transform that was previously applied to the given socket
			*/
			public void removeTransportModeTransform(FileDescriptor socket, IpSecTransform transform) {
			removeTransportModeTransform(new ParcelFileDescriptor(socket), transform);
			}

	/* Call down to activate a transform */		/* Call down to activate a transform */
	private void removeTransportModeTransform(ParcelFileDescriptor pfd, IpSecTransform transform) {		private void removeTransportModeTransform(ParcelFileDescriptor pfd, IpSecTransform transform) {
	try {		try {