Merge "Add additional SystemApi for NetworkStack" (50d8a038) · Commits · e / os / android_frameworks_base

api/system-current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -4043,6 +4043,10 @@ package android.net {
		method public void onTetheringStarted();
		}

		public final class IpPrefix implements android.os.Parcelable {
		ctor public IpPrefix(java.net.InetAddress, int);
		}

		public final class IpSecManager {
		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;
		@@ -4075,6 +4079,7 @@ package android.net {
		}

		public class LinkAddress implements android.os.Parcelable {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		ctor public LinkAddress(java.net.InetAddress, int);
		ctor public LinkAddress(String);
		method public boolean isGlobalPreferred();
		@@ -4085,9 +4090,12 @@ package android.net {

		public final class LinkProperties implements android.os.Parcelable {
		ctor public LinkProperties();
		ctor public LinkProperties(android.net.LinkProperties);
		method public boolean addDnsServer(java.net.InetAddress);
		method public boolean addRoute(android.net.RouteInfo);
		method public void clear();
		method @Nullable public android.net.IpPrefix getNat64Prefix();
		method public java.util.List<java.net.InetAddress> getPcscfServers();
		method public String getTcpBufferSizes();
		method public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();
		method public boolean hasGlobalIPv6Address();
		@@ -4105,6 +4113,8 @@ package android.net {
		method public void setInterfaceName(String);
		method public void setLinkAddresses(java.util.Collection<android.net.LinkAddress>);
		method public void setMtu(int);
		method public void setNat64Prefix(android.net.IpPrefix);
		method public void setPcscfServers(java.util.Collection<java.net.InetAddress>);
		method public void setPrivateDnsServerName(@Nullable String);
		method public void setTcpBufferSizes(String);
		method public void setUsePrivateDns(boolean);
		@@ -4159,6 +4169,7 @@ package android.net {
		}

		public final class RouteInfo implements android.os.Parcelable {
		ctor public RouteInfo(android.net.IpPrefix, java.net.InetAddress, String, int);
		method public int getType();
		field public static final int RTN_THROW = 9; // 0x9
		field public static final int RTN_UNICAST = 1; // 0x1
		@@ -4292,6 +4303,7 @@ package android.net.metrics {
		}

		public class IpConnectivityLog {
		ctor public IpConnectivityLog();
		method public boolean log(long, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(String, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.Network, int[], android.net.metrics.IpConnectivityLog.Event);
		@@ -4340,6 +4352,20 @@ package android.net.metrics {
		field public static final int NETWORK_VALIDATION_FAILED = 3; // 0x3
		}

		public final class RaEvent implements android.net.metrics.IpConnectivityLog.Event {
		}

		public static class RaEvent.Builder {
		ctor public RaEvent.Builder();
		method public android.net.metrics.RaEvent build();
		method public android.net.metrics.RaEvent.Builder updateDnsslLifetime(long);
		method public android.net.metrics.RaEvent.Builder updatePrefixPreferredLifetime(long);
		method public android.net.metrics.RaEvent.Builder updatePrefixValidLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRdnssLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRouteInfoLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRouterLifetime(long);
		}

		public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {
		method public static String getProbeName(int);
		field public static final int DNS_FAILURE = 0; // 0x0

api/test-current.txt

+26 −0

Original line number	Diff line number	Diff line
		@@ -802,11 +802,16 @@ package android.net {
		field public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = "android.net.extra.CAPTIVE_PORTAL_USER_AGENT";
		}

		public final class IpPrefix implements android.os.Parcelable {
		ctor public IpPrefix(java.net.InetAddress, int);
		}

		public final class IpSecManager {
		field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
		}

		public class LinkAddress implements android.os.Parcelable {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		method public boolean isGlobalPreferred();
		method public boolean isIPv4();
		method public boolean isIPv6();
		@@ -814,7 +819,10 @@ package android.net {
		}

		public final class LinkProperties implements android.os.Parcelable {
		ctor public LinkProperties(android.net.LinkProperties);
		method public boolean addDnsServer(java.net.InetAddress);
		method @Nullable public android.net.IpPrefix getNat64Prefix();
		method public java.util.List<java.net.InetAddress> getPcscfServers();
		method public String getTcpBufferSizes();
		method public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();
		method public boolean hasGlobalIPv6Address();
		@@ -826,6 +834,8 @@ package android.net {
		method public boolean isReachable(java.net.InetAddress);
		method public boolean removeDnsServer(java.net.InetAddress);
		method public boolean removeRoute(android.net.RouteInfo);
		method public void setNat64Prefix(android.net.IpPrefix);
		method public void setPcscfServers(java.util.Collection<java.net.InetAddress>);
		method public void setPrivateDnsServerName(@Nullable String);
		method public void setTcpBufferSizes(String);
		method public void setUsePrivateDns(boolean);
		@@ -843,6 +853,7 @@ package android.net {
		}

		public final class RouteInfo implements android.os.Parcelable {
		ctor public RouteInfo(android.net.IpPrefix, java.net.InetAddress, String, int);
		method public int getType();
		field public static final int RTN_THROW = 9; // 0x9
		field public static final int RTN_UNICAST = 1; // 0x1
		@@ -929,6 +940,7 @@ package android.net.metrics {
		}

		public class IpConnectivityLog {
		ctor public IpConnectivityLog();
		method public boolean log(long, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(String, android.net.metrics.IpConnectivityLog.Event);
		method public boolean log(android.net.Network, int[], android.net.metrics.IpConnectivityLog.Event);
		@@ -977,6 +989,20 @@ package android.net.metrics {
		field public static final int NETWORK_VALIDATION_FAILED = 3; // 0x3
		}

		public final class RaEvent implements android.net.metrics.IpConnectivityLog.Event {
		}

		public static class RaEvent.Builder {
		ctor public RaEvent.Builder();
		method public android.net.metrics.RaEvent build();
		method public android.net.metrics.RaEvent.Builder updateDnsslLifetime(long);
		method public android.net.metrics.RaEvent.Builder updatePrefixPreferredLifetime(long);
		method public android.net.metrics.RaEvent.Builder updatePrefixValidLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRdnssLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRouteInfoLifetime(long);
		method public android.net.metrics.RaEvent.Builder updateRouterLifetime(long);
		}

		public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {
		method public static String getProbeName(int);
		field public static final int DNS_FAILURE = 0; // 0x0

core/java/android/net/IpPrefix.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.net;

		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		import android.os.Parcelable;
		import android.util.Pair;
		@@ -83,6 +85,8 @@ public final class IpPrefix implements Parcelable {
		* @param prefixLength the prefix length. Must be >= 0 and <= (32 or 128) (IPv4 or IPv6).
		* @hide
		*/
		@SystemApi
		@TestApi
		public IpPrefix(InetAddress address, int prefixLength) {
		// We don't reuse the (byte[], int) constructor because it calls clone() on the byte array,
		// which is unnecessary because getAddress() already returns a clone.

core/java/android/net/LinkAddress.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,8 @@ public class LinkAddress implements Parcelable {
		* {@link OsConstants#RT_SCOPE_LINK} or {@link OsConstants#RT_SCOPE_SITE}).
		* @hide
		*/
		@SystemApi
		@TestApi
		public LinkAddress(InetAddress address, int prefixLength, int flags, int scope) {
		init(address, prefixLength, flags, scope);
		}

core/java/android/net/LinkProperties.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -174,7 +174,8 @@ public final class LinkProperties implements Parcelable {
		/**
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		@TestApi
		public LinkProperties(LinkProperties source) {
		if (source != null) {
		mIfaceName = source.mIfaceName;
		@@ -576,6 +577,8 @@ public final class LinkProperties implements Parcelable {
		* @param addresses The {@link Collection} of PCSCF servers to set in this object.
		* @hide
		*/
		@SystemApi
		@TestApi
		public void setPcscfServers(Collection<InetAddress> pcscfServers) {
		mPcscfs.clear();
		for (InetAddress pcscfServer: pcscfServers) {
		@@ -590,6 +593,8 @@ public final class LinkProperties implements Parcelable {
		* this link.
		* @hide
		*/
		@SystemApi
		@TestApi
		public List<InetAddress> getPcscfServers() {
		return Collections.unmodifiableList(mPcscfs);
		}
		@@ -781,6 +786,8 @@ public final class LinkProperties implements Parcelable {
		* @return the NAT64 prefix.
		* @hide
		*/
		@SystemApi
		@TestApi
		public @Nullable IpPrefix getNat64Prefix() {
		return mNat64Prefix;
		}
		@@ -794,6 +801,8 @@ public final class LinkProperties implements Parcelable {
		* @param prefix the NAT64 prefix.
		* @hide
		*/
		@SystemApi
		@TestApi
		public void setNat64Prefix(IpPrefix prefix) {
		if (prefix != null && prefix.getPrefixLength() != 96) {
		throw new IllegalArgumentException("Only 96-bit prefixes are supported: " + prefix);