Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am:... (229ef448) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -25632,8 +25632,6 @@ package android.net {
	method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;		method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
	method public void applyTransportModeTransform(@NonNull java.net.DatagramSocket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;		method public void applyTransportModeTransform(@NonNull java.net.DatagramSocket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
	method public void applyTransportModeTransform(@NonNull java.io.FileDescriptor, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;		method public void applyTransportModeTransform(@NonNull java.io.FileDescriptor, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
	method @RequiresPermission("android.permission.MANAGE_IPSEC_TUNNELS") public void applyTunnelModeTransform(@NonNull android.net.IpSecManager.IpSecTunnelInterface, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
	method @NonNull @RequiresPermission("android.permission.MANAGE_IPSEC_TUNNELS") public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;		method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;		method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	method public void removeTransportModeTransforms(@NonNull java.net.Socket) throws java.io.IOException;		method public void removeTransportModeTransforms(@NonNull java.net.Socket) throws java.io.IOException;
	@@ -25643,12 +25641,6 @@ package android.net {
	field public static final int DIRECTION_OUT = 1; // 0x1		field public static final int DIRECTION_OUT = 1; // 0x1
	}		}

	public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {
	method @RequiresPermission("android.permission.MANAGE_IPSEC_TUNNELS") public void addAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException;
	method public void close();
	method @RequiresPermission("android.permission.MANAGE_IPSEC_TUNNELS") public void removeAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException;
	}

	public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {		public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {
	}		}

core/api/system-current.txt

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6951,11 +6951,15 @@ package android.net {
	}		}

	public final class IpSecManager {		public final class IpSecManager {
	method @Deprecated @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;		method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void applyTunnelModeTransform(@NonNull android.net.IpSecManager.IpSecTunnelInterface, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
			method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public android.net.IpSecManager.IpSecTunnelInterface createIpSecTunnelInterface(@NonNull java.net.InetAddress, @NonNull java.net.InetAddress, @NonNull android.net.Network) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
	}		}

	public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {		public static final class IpSecManager.IpSecTunnelInterface implements java.lang.AutoCloseable {
			method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void addAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException;
			method public void close();
	method @NonNull public String getInterfaceName();		method @NonNull public String getInterfaceName();
			method @RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS) public void removeAddress(@NonNull java.net.InetAddress, int) throws java.io.IOException;
	}		}

	public static class IpSecTransform.Builder {		public static class IpSecTransform.Builder {

core/java/android/net/IpSecManager.java

+27 −64

Original line number	Original line	Diff line number	Diff line
	@@ -707,7 +707,7 @@ public final class IpSecManager {
	}		}

	/**		/**
	* This class represents an IpSecTunnelInterface.		* This class represents an IpSecTunnelInterface
	*		*
	* <p>IpSecTunnelInterface objects track tunnel interfaces that serve as		* <p>IpSecTunnelInterface objects track tunnel interfaces that serve as
	* local endpoints for IPsec tunnels.		* local endpoints for IPsec tunnels.
	@@ -716,7 +716,9 @@ public final class IpSecManager {
	* applied to provide IPsec security to packets sent through the tunnel. While a tunnel		* applied to provide IPsec security to packets sent through the tunnel. While a tunnel
	* cannot be used in standalone mode within Android, the higher layers may use the tunnel		* cannot be used in standalone mode within Android, the higher layers may use the tunnel
	* to create Network objects which are accessible to the Android system.		* to create Network objects which are accessible to the Android system.
			* @hide
	*/		*/
			@SystemApi
	public static final class IpSecTunnelInterface implements AutoCloseable {		public static final class IpSecTunnelInterface implements AutoCloseable {
	private final String mOpPackageName;		private final String mOpPackageName;
	private final IIpSecService mService;		private final IIpSecService mService;
	@@ -727,26 +729,23 @@ public final class IpSecManager {
	private String mInterfaceName;		private String mInterfaceName;
	private int mResourceId = INVALID_RESOURCE_ID;		private int mResourceId = INVALID_RESOURCE_ID;

	/**		/** Get the underlying SPI held by this object. */
	* Get the underlying SPI held by this object.
	*
	* @hide
	*/
	@SystemApi
	@NonNull		@NonNull
	public String getInterfaceName() {		public String getInterfaceName() {
	return mInterfaceName;		return mInterfaceName;
	}		}

	/**		/**
	* Add an address to the IpSecTunnelInterface.		* Add an address to the IpSecTunnelInterface
	*		*
	* <p>Add an address which may be used as the local inner address for		* <p>Add an address which may be used as the local inner address for
	* tunneled traffic.		* tunneled traffic.
	*		*
	* @param address the local address for traffic inside the tunnel		* @param address the local address for traffic inside the tunnel
	* @param prefixLen length of the InetAddress prefix		* @param prefixLen length of the InetAddress prefix
			* @hide
	*/		*/
			@SystemApi
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)		@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
	@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)		@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)
	public void addAddress(@NonNull InetAddress address, int prefixLen) throws IOException {		public void addAddress(@NonNull InetAddress address, int prefixLen) throws IOException {
	@@ -761,13 +760,15 @@ public final class IpSecManager {
	}		}

	/**		/**
	* Remove an address from the IpSecTunnelInterface.		* Remove an address from the IpSecTunnelInterface
	*		*
	* <p>Remove an address which was previously added to the IpSecTunnelInterface.		* <p>Remove an address which was previously added to the IpSecTunnelInterface
	*		*
	* @param address to be removed		* @param address to be removed
	* @param prefixLen length of the InetAddress prefix		* @param prefixLen length of the InetAddress prefix
			* @hide
	*/		*/
			@SystemApi
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)		@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
	@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)		@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)
	public void removeAddress(@NonNull InetAddress address, int prefixLen) throws IOException {		public void removeAddress(@NonNull InetAddress address, int prefixLen) throws IOException {
	@@ -818,7 +819,7 @@ public final class IpSecManager {
	}		}

	/**		/**
	* Delete an IpSecTunnelInterface.		* Delete an IpSecTunnelInterface
	*		*
	* <p>Calling close will deallocate the IpSecTunnelInterface and all of its system		* <p>Calling close will deallocate the IpSecTunnelInterface and all of its system
	* resources. Any packets bound for this interface either inbound or outbound will		* resources. Any packets bound for this interface either inbound or outbound will
	@@ -840,12 +841,7 @@ public final class IpSecManager {
	}		}
	}		}

			/** Check that the Interface was closed properly. */
	/**
	* Check that the Interface was closed properly.
	*
	* @hide
	*/
	@Override		@Override
	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	if (mCloseGuard != null) {		if (mCloseGuard != null) {
	@@ -877,52 +873,17 @@ public final class IpSecManager {
	* Create a new IpSecTunnelInterface as a local endpoint for tunneled IPsec traffic.		* Create a new IpSecTunnelInterface as a local endpoint for tunneled IPsec traffic.
	*		*
	* <p>An application that creates tunnels is responsible for cleaning up the tunnel when the		* <p>An application that creates tunnels is responsible for cleaning up the tunnel when the
	* underlying network disconnects, and the {@link		* underlying network goes away, and the onLost() callback is received.
	* ConnectivityManager.NetworkCallback#onLost(Network)} callback is received.
	*
	* @param underlyingNetwork the {@link Network} that will carry traffic for this tunnel. Packets
	* that go through the tunnel will need a underlying network to transit to the IPsec peer.
	* This network should almost certainly be a physical network such as WiFi.
	* @return a new {@link IpSecTunnelInterface} with the specified properties
	* @throws IOException indicating that the tunnel could not be created due to a lower-layer
	* error
	* @throws ResourceUnavailableException indicating that the number of opening tunnels has
	* reached the limit.
	*/
	@NonNull
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
	@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)
	public IpSecTunnelInterface createIpSecTunnelInterface(@NonNull Network underlyingNetwork)
	throws ResourceUnavailableException, IOException {

	// TODO: Remove the need for adding two unused addresses with IPsec tunnels when {@link
	// #createIpSecTunnelInterface(localAddress, remoteAddress, underlyingNetwork)} can be
	// safely removed.
	final InetAddress address = InetAddress.getLocalHost();
	return createIpSecTunnelInterface(address, address, underlyingNetwork);
	}

	/**
	* Create a new IpSecTunnelInterface as a local endpoint for tunneled IPsec traffic.
	*		*
	* <p>An application that creates tunnels is responsible for cleaning up the tunnel when the		* @param localAddress The local addres of the tunnel
	* underlying network disconnects, and the {@link		* @param remoteAddress The local addres of the tunnel
	* ConnectivityManager.NetworkCallback#onLost(Network)} callback is received.		* @param underlyingNetwork the {@link Network} that will carry traffic for this tunnel.
	*		* This network should almost certainly be a network such as WiFi with an L2 address.
	* @param localAddress The local address of the tunnel		* @return a new {@link IpSecManager#IpSecTunnelInterface} with the specified properties
	* @param remoteAddress The local address of the tunnel		* @throws IOException indicating that the socket could not be opened or bound
	* @param underlyingNetwork the {@link Network} that will carry traffic for this tunnel. Packets		* @throws ResourceUnavailableException indicating that too many encapsulation sockets are open
	* that go through the tunnel will need a underlying network to transit to the IPsec peer.
	* This network should almost certainly be a physical network such as WiFi.
	* @return a new {@link IpSecTunnelInterface} with the specified properties
	* @throws IOException indicating that the tunnel could not be created due to a lower-layer
	* error
	* @throws ResourceUnavailableException indicating that the number of opening tunnels has
	* reached the limit.
	* @hide		* @hide
	* @deprecated Callers should use {@link #createIpSecTunnelInterface(Network)}
	*/		*/
	@Deprecated
	@SystemApi		@SystemApi
	@NonNull		@NonNull
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)		@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
	@@ -946,14 +907,16 @@ public final class IpSecManager {
	* <p>Applications should probably not use this API directly.		* <p>Applications should probably not use this API directly.
	*		*
	*		*
	* @param tunnel The {@link IpSecTunnelInterface} that will use the supplied		* @param tunnel The {@link IpSecManager#IpSecTunnelInterface} that will use the supplied
	* transform.		* transform.
	* @param direction the direction, {@link #DIRECTION_OUT} or {@link #DIRECTION_IN} in which		* @param direction the direction, {@link DIRECTION_OUT} or {@link #DIRECTION_IN} in which
	* the transform will be used.		* the transform will be used.
	* @param transform an {@link IpSecTransform} created in tunnel mode		* @param transform an {@link IpSecTransform} created in tunnel mode
	* @throws IOException indicating that the transform could not be applied due to a lower-layer		* @throws IOException indicating that the transform could not be applied due to a lower
	* error		* layer failure.
			* @hide
	*/		*/
			@SystemApi
	@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)		@RequiresFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
	@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)		@RequiresPermission(android.Manifest.permission.MANAGE_IPSEC_TUNNELS)
	public void applyTunnelModeTransform(@NonNull IpSecTunnelInterface tunnel,		public void applyTunnelModeTransform(@NonNull IpSecTunnelInterface tunnel,