Merge "Merge "Fix Automated API Review issues." am: 43c1ade661 am: 9e3f29037b am: ce18c5a1ec" (80d61df3) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −6

Original line number	Diff line number	Diff line
		@@ -28852,16 +28852,25 @@ package android.net {
		}

		public final class LinkProperties implements android.os.Parcelable {
		ctor public LinkProperties();
		method public boolean addRoute(@NonNull android.net.RouteInfo);
		method public void clear();
		method public int describeContents();
		method public java.util.List<java.net.InetAddress> getDnsServers();
		method public String getDomains();
		method public android.net.ProxyInfo getHttpProxy();
		method @NonNull public java.util.List<java.net.InetAddress> getDnsServers();
		method @Nullable public String getDomains();
		method @Nullable public android.net.ProxyInfo getHttpProxy();
		method @Nullable public String getInterfaceName();
		method public java.util.List<android.net.LinkAddress> getLinkAddresses();
		method @NonNull public java.util.List<android.net.LinkAddress> getLinkAddresses();
		method public int getMtu();
		method @Nullable public String getPrivateDnsServerName();
		method public java.util.List<android.net.RouteInfo> getRoutes();
		method @NonNull public java.util.List<android.net.RouteInfo> getRoutes();
		method public boolean isPrivateDnsActive();
		method public void setDnsServers(@NonNull java.util.Collection<java.net.InetAddress>);
		method public void setDomains(@Nullable String);
		method public void setHttpProxy(@Nullable android.net.ProxyInfo);
		method public void setInterfaceName(@Nullable String);
		method public void setLinkAddresses(@NonNull java.util.Collection<android.net.LinkAddress>);
		method public void setMtu(int);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.LinkProperties> CREATOR;
		}
		@@ -28969,6 +28978,7 @@ package android.net {
		method public int describeContents();
		method public int getLinkDownstreamBandwidthKbps();
		method public int getLinkUpstreamBandwidthKbps();
		method public int getSignalStrength();
		method @Nullable public android.net.TransportInfo getTransportInfo();
		method public boolean hasCapability(int);
		method public boolean hasTransport(int);
		@@ -28997,6 +29007,7 @@ package android.net {
		field public static final int NET_CAPABILITY_VALIDATED = 16; // 0x10
		field public static final int NET_CAPABILITY_WIFI_P2P = 6; // 0x6
		field public static final int NET_CAPABILITY_XCAP = 9; // 0x9
		field public static final int SIGNAL_STRENGTH_UNSPECIFIED = -2147483648; // 0x80000000
		field public static final int TRANSPORT_BLUETOOTH = 2; // 0x2
		field public static final int TRANSPORT_CELLULAR = 0; // 0x0
		field public static final int TRANSPORT_ETHERNET = 3; // 0x3
		@@ -29008,7 +29019,7 @@ package android.net {

		@Deprecated public class NetworkInfo implements android.os.Parcelable {
		method @Deprecated public int describeContents();
		method @Deprecated public android.net.NetworkInfo.DetailedState getDetailedState();
		method @Deprecated @NonNull public android.net.NetworkInfo.DetailedState getDetailedState();
		method @Deprecated public String getExtraInfo();
		method @Deprecated public String getReason();
		method @Deprecated public android.net.NetworkInfo.State getState();

api/system-current.txt

+42 −52

Original line number	Diff line number	Diff line
		@@ -4044,7 +4044,7 @@ package android.net {
		method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEventCallback);
		method @RequiresPermission(anyOf={"android.permission.NETWORK_SETTINGS", android.Manifest.permission.NETWORK_SETUP_WIZARD, "android.permission.NETWORK_STACK"}) public void setAirplaneMode(boolean);
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.net.Network, android.os.Bundle);
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);
		method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void stopTethering(int);
		@@ -4075,8 +4075,8 @@ package android.net {
		}

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

		public final class IpSecManager {
		@@ -4099,57 +4099,47 @@ package android.net {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		ctor public LinkAddress(@NonNull java.net.InetAddress, int);
		ctor public LinkAddress(@NonNull String);
		ctor public LinkAddress(String, int, int);
		ctor public LinkAddress(@NonNull String, int, int);
		method public boolean isGlobalPreferred();
		method public boolean isIPv4();
		method public boolean isIPv6();
		method public boolean isSameAddressAs(android.net.LinkAddress);
		method public boolean isIpv4();
		method public boolean isIpv6();
		method public boolean isSameAddressAs(@Nullable android.net.LinkAddress);
		}

		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 addLinkAddress(android.net.LinkAddress);
		method public boolean addRoute(android.net.RouteInfo);
		method public void clear();
		ctor public LinkProperties(@Nullable android.net.LinkProperties);
		method public boolean addDnsServer(@NonNull java.net.InetAddress);
		method public boolean addLinkAddress(@NonNull android.net.LinkAddress);
		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();
		method public boolean hasIPv4Address();
		method public boolean hasIPv6DefaultRoute();
		method public boolean isIPv4Provisioned();
		method public boolean isIPv6Provisioned();
		method @NonNull public java.util.List<java.net.InetAddress> getPcscfServers();
		method @Nullable public String getTcpBufferSizes();
		method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();
		method public boolean hasGlobalIpv6Address();
		method public boolean hasIpv4Address();
		method public boolean hasIpv6DefaultRoute();
		method public boolean isIpv4Provisioned();
		method public boolean isIpv6Provisioned();
		method public boolean isProvisioned();
		method public boolean isReachable(java.net.InetAddress);
		method public boolean removeDnsServer(java.net.InetAddress);
		method public boolean removeLinkAddress(android.net.LinkAddress);
		method public boolean removeRoute(android.net.RouteInfo);
		method public void setDnsServers(java.util.Collection<java.net.InetAddress>);
		method public void setDomains(String);
		method public void setHttpProxy(android.net.ProxyInfo);
		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 boolean isReachable(@NonNull java.net.InetAddress);
		method public boolean removeDnsServer(@NonNull java.net.InetAddress);
		method public boolean removeLinkAddress(@NonNull android.net.LinkAddress);
		method public boolean removeRoute(@NonNull android.net.RouteInfo);
		method public void setNat64Prefix(@Nullable android.net.IpPrefix);
		method public void setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>);
		method public void setPrivateDnsServerName(@Nullable String);
		method public void setTcpBufferSizes(String);
		method public void setTcpBufferSizes(@Nullable String);
		method public void setUsePrivateDns(boolean);
		method public void setValidatedPrivateDnsServers(java.util.Collection<java.net.InetAddress>);
		method public void setValidatedPrivateDnsServers(@NonNull java.util.Collection<java.net.InetAddress>);
		}

		public class Network implements android.os.Parcelable {
		ctor public Network(android.net.Network);
		method public android.net.Network getPrivateDnsBypassingCopy();
		ctor public Network(@NonNull android.net.Network);
		method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
		}

		public final class NetworkCapabilities implements android.os.Parcelable {
		method public int getSignalStrength();
		method public int[] getTransportTypes();
		method public boolean satisfiedByNetworkCapabilities(android.net.NetworkCapabilities);
		method @NonNull public int[] getTransportTypes();
		method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
		field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16
		field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18
		}
		@@ -4171,7 +4161,7 @@ package android.net {
		}

		public static class NetworkRequest.Builder {
		method public android.net.NetworkRequest.Builder setSignalStrength(int);
		method @NonNull public android.net.NetworkRequest.Builder setSignalStrength(int);
		}

		public class NetworkScoreManager {
		@@ -4195,7 +4185,7 @@ package android.net {
		}

		public final class RouteInfo implements android.os.Parcelable {
		ctor public RouteInfo(android.net.IpPrefix, java.net.InetAddress, String, int);
		ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int);
		method public int getType();
		field public static final int RTN_THROW = 9; // 0x9
		field public static final int RTN_UNICAST = 1; // 0x1
		@@ -4284,8 +4274,8 @@ package android.net.apf {
		public final class ApfCapabilities implements android.os.Parcelable {
		ctor public ApfCapabilities(int, int, int);
		method public int describeContents();
		method public static boolean getApfDrop8023Frames(android.content.Context);
		method public static int[] getApfEthTypeBlackList(android.content.Context);
		method public static boolean getApfDrop8023Frames(@NonNull android.content.Context);
		method @NonNull public static int[] getApfEthTypeBlackList(@NonNull android.content.Context);
		method public boolean hasDataAccess();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.apf.ApfCapabilities> CREATOR;
		@@ -4451,15 +4441,15 @@ package android.net.metrics {
		public final class RaEvent implements android.net.metrics.IpConnectivityLog.Event {
		}

		public static class RaEvent.Builder {
		public static final 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);
		method @NonNull public android.net.metrics.RaEvent build();
		method @NonNull public android.net.metrics.RaEvent.Builder updateDnsslLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixPreferredLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixValidLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRdnssLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRouteInfoLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRouterLifetime(long);
		}

		public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {

api/test-current.txt

+41 −41

Original line number	Diff line number	Diff line
		@@ -1216,14 +1216,14 @@ package android.net {
		}

		public class ConnectivityManager {
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(android.net.Network, android.os.Bundle);
		method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);
		field public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC = "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";
		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);
		ctor public IpPrefix(String);
		ctor public IpPrefix(@NonNull java.net.InetAddress, int);
		ctor public IpPrefix(@NonNull String);
		}

		public final class IpSecManager {
		@@ -1234,48 +1234,48 @@ package android.net {
		ctor public LinkAddress(java.net.InetAddress, int, int, int);
		ctor public LinkAddress(@NonNull java.net.InetAddress, int);
		ctor public LinkAddress(@NonNull String);
		ctor public LinkAddress(String, int, int);
		ctor public LinkAddress(@NonNull String, int, int);
		method public boolean isGlobalPreferred();
		method public boolean isIPv4();
		method public boolean isIPv6();
		method public boolean isSameAddressAs(android.net.LinkAddress);
		method public boolean isIpv4();
		method public boolean isIpv6();
		method public boolean isSameAddressAs(@Nullable android.net.LinkAddress);
		}

		public final class LinkProperties implements android.os.Parcelable {
		ctor public LinkProperties(android.net.LinkProperties);
		method public boolean addDnsServer(java.net.InetAddress);
		method public boolean addLinkAddress(android.net.LinkAddress);
		ctor public LinkProperties(@Nullable android.net.LinkProperties);
		method public boolean addDnsServer(@NonNull java.net.InetAddress);
		method public boolean addLinkAddress(@NonNull android.net.LinkAddress);
		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();
		method public boolean hasIPv4Address();
		method public boolean hasIPv6DefaultRoute();
		method public boolean isIPv4Provisioned();
		method public boolean isIPv6Provisioned();
		method @NonNull public java.util.List<java.net.InetAddress> getPcscfServers();
		method @Nullable public String getTcpBufferSizes();
		method @NonNull public java.util.List<java.net.InetAddress> getValidatedPrivateDnsServers();
		method public boolean hasGlobalIpv6Address();
		method public boolean hasIpv4Address();
		method public boolean hasIpv6DefaultRoute();
		method public boolean isIpv4Provisioned();
		method public boolean isIpv6Provisioned();
		method public boolean isProvisioned();
		method public boolean isReachable(java.net.InetAddress);
		method public boolean removeDnsServer(java.net.InetAddress);
		method public boolean removeLinkAddress(android.net.LinkAddress);
		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 boolean isReachable(@NonNull java.net.InetAddress);
		method public boolean removeDnsServer(@NonNull java.net.InetAddress);
		method public boolean removeLinkAddress(@NonNull android.net.LinkAddress);
		method public boolean removeRoute(@NonNull android.net.RouteInfo);
		method public void setNat64Prefix(@Nullable android.net.IpPrefix);
		method public void setPcscfServers(@NonNull java.util.Collection<java.net.InetAddress>);
		method public void setPrivateDnsServerName(@Nullable String);
		method public void setTcpBufferSizes(String);
		method public void setTcpBufferSizes(@Nullable String);
		method public void setUsePrivateDns(boolean);
		method public void setValidatedPrivateDnsServers(java.util.Collection<java.net.InetAddress>);
		method public void setValidatedPrivateDnsServers(@NonNull java.util.Collection<java.net.InetAddress>);
		}

		public class Network implements android.os.Parcelable {
		ctor public Network(android.net.Network);
		method public android.net.Network getPrivateDnsBypassingCopy();
		ctor public Network(@NonNull android.net.Network);
		method @NonNull public android.net.Network getPrivateDnsBypassingCopy();
		}

		public final class NetworkCapabilities implements android.os.Parcelable {
		method public int[] getCapabilities();
		method public int[] getTransportTypes();
		method public boolean satisfiedByNetworkCapabilities(android.net.NetworkCapabilities);
		method @NonNull public int[] getTransportTypes();
		method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
		field public static final int TRANSPORT_TEST = 7; // 0x7
		}

		@@ -1284,7 +1284,7 @@ package android.net {
		}

		public final class RouteInfo implements android.os.Parcelable {
		ctor public RouteInfo(android.net.IpPrefix, java.net.InetAddress, String, int);
		ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int);
		method public int getType();
		field public static final int RTN_THROW = 9; // 0x9
		field public static final int RTN_UNICAST = 1; // 0x1
		@@ -1341,8 +1341,8 @@ package android.net.apf {
		public final class ApfCapabilities implements android.os.Parcelable {
		ctor public ApfCapabilities(int, int, int);
		method public int describeContents();
		method public static boolean getApfDrop8023Frames(android.content.Context);
		method public static int[] getApfEthTypeBlackList(android.content.Context);
		method public static boolean getApfDrop8023Frames(@NonNull android.content.Context);
		method @NonNull public static int[] getApfEthTypeBlackList(@NonNull android.content.Context);
		method public boolean hasDataAccess();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.net.apf.ApfCapabilities> CREATOR;
		@@ -1508,15 +1508,15 @@ package android.net.metrics {
		public final class RaEvent implements android.net.metrics.IpConnectivityLog.Event {
		}

		public static class RaEvent.Builder {
		public static final 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);
		method @NonNull public android.net.metrics.RaEvent build();
		method @NonNull public android.net.metrics.RaEvent.Builder updateDnsslLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixPreferredLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updatePrefixValidLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRdnssLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRouteInfoLifetime(long);
		method @NonNull public android.net.metrics.RaEvent.Builder updateRouterLifetime(long);
		}

		public final class ValidationProbeEvent implements android.net.metrics.IpConnectivityLog.Event {

core/java/android/net/ConnectivityManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4088,7 +4088,7 @@ public class ConnectivityManager {
		@SystemApi
		@TestApi
		@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
		public void startCaptivePortalApp(Network network, Bundle appExtras) {
		public void startCaptivePortalApp(@NonNull Network network, @NonNull Bundle appExtras) {
		try {
		mService.startCaptivePortalAppInternal(network, appExtras);
		} catch (RemoteException e) {

core/java/android/net/IpPrefix.java

+4 −3

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

		package android.net;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		@@ -70,7 +71,7 @@ public final class IpPrefix implements Parcelable {
		*
		* @hide
		*/
		public IpPrefix(byte[] address, int prefixLength) {
		public IpPrefix(@NonNull byte[] address, int prefixLength) {
		this.address = address.clone();
		this.prefixLength = prefixLength;
		checkAndMaskAddressAndPrefixLength();
		@@ -87,7 +88,7 @@ public final class IpPrefix implements Parcelable {
		*/
		@SystemApi
		@TestApi
		public IpPrefix(InetAddress address, int prefixLength) {
		public IpPrefix(@NonNull 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.
		this.address = address.getAddress();
		@@ -106,7 +107,7 @@ public final class IpPrefix implements Parcelable {
		*/
		@SystemApi
		@TestApi
		public IpPrefix(String prefix) {
		public IpPrefix(@NonNull String prefix) {
		// We don't reuse the (InetAddress, int) constructor because "error: call to this must be
		// first statement in constructor". We could factor out setting the member variables to an
		// init() method, but if we did, then we'd have to make the members non-final, or "error: