Merge "Unhide LinkProperties, NetworkCapabilities, NetworkRequest APIs" am:... (b059128f) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -28447,6 +28447,7 @@ package android.net {
		method public android.net.ProxyInfo getHttpProxy();
		method public java.lang.String getInterfaceName();
		method public java.util.List<android.net.LinkAddress> getLinkAddresses();
		method public int getMtu();
		method public java.lang.String getPrivateDnsServerName();
		method public java.util.List<android.net.RouteInfo> getRoutes();
		method public boolean isPrivateDnsActive();

api/system-current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -3518,7 +3518,20 @@ package android.net {
		ctor public LinkAddress(java.lang.String);
		}

		public final class LinkProperties implements android.os.Parcelable {
		ctor public LinkProperties();
		method public boolean addRoute(android.net.RouteInfo);
		method public void clear();
		method public void setDnsServers(java.util.Collection<java.net.InetAddress>);
		method public void setDomains(java.lang.String);
		method public void setHttpProxy(android.net.ProxyInfo);
		method public void setInterfaceName(java.lang.String);
		method public void setLinkAddresses(java.util.Collection<android.net.LinkAddress>);
		method public void setMtu(int);
		}

		public final class NetworkCapabilities implements android.os.Parcelable {
		method public int getSignalStrength();
		field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16
		}

		@@ -3538,6 +3551,10 @@ package android.net {
		method public abstract void onRequestScores(android.net.NetworkKey[]);
		}

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

		public class NetworkScoreManager {
		method public boolean clearScores() throws java.lang.SecurityException;
		method public void disableScoring() throws java.lang.SecurityException;

core/java/android/net/LinkProperties.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.net;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -161,7 +162,7 @@ public final class LinkProperties implements Parcelable {
		/**
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public LinkProperties() {
		}

		@@ -195,7 +196,7 @@ public final class LinkProperties implements Parcelable {
		* @param iface The name of the network interface used for this link.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setInterfaceName(String iface) {
		mIfaceName = iface;
		ArrayList<RouteInfo> newRoutes = new ArrayList<>(mRoutes.size());
		@@ -346,7 +347,7 @@ public final class LinkProperties implements Parcelable {
		* object.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setLinkAddresses(Collection<LinkAddress> addresses) {
		mLinkAddresses.clear();
		for (LinkAddress address: addresses) {
		@@ -392,7 +393,7 @@ public final class LinkProperties implements Parcelable {
		* @param dnsServers The {@link Collection} of DNS servers to set in this object.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setDnsServers(Collection<InetAddress> dnsServers) {
		mDnses.clear();
		for (InetAddress dnsServer: dnsServers) {
		@@ -529,7 +530,7 @@ public final class LinkProperties implements Parcelable {
		* domains to search when resolving host names on this link.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setDomains(String domains) {
		mDomains = domains;
		}
		@@ -552,7 +553,7 @@ public final class LinkProperties implements Parcelable {
		* @param mtu The MTU to use for this link.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setMtu(int mtu) {
		mMtu = mtu;
		}
		@@ -562,9 +563,7 @@ public final class LinkProperties implements Parcelable {
		* this will return 0.
		*
		* @return The mtu value set for this link.
		* @hide
		*/
		@UnsupportedAppUsage
		public int getMtu() {
		return mMtu;
		}
		@@ -613,7 +612,7 @@ public final class LinkProperties implements Parcelable {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public boolean addRoute(RouteInfo route) {
		if (route != null) {
		String routeIface = route.getInterface();
		@@ -688,7 +687,7 @@ public final class LinkProperties implements Parcelable {
		* @param proxy A {@link ProxyInfo} defining the HTTP Proxy to use on this link.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void setHttpProxy(ProxyInfo proxy) {
		mHttpProxy = proxy;
		}
		@@ -760,7 +759,7 @@ public final class LinkProperties implements Parcelable {
		* Clears this object to its initial state.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public void clear() {
		mIfaceName = null;
		mLinkAddresses.clear();

core/java/android/net/NetworkCapabilities.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1017,7 +1017,7 @@ public final class NetworkCapabilities implements Parcelable {
		* @return The bearer-specific signal strength.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public int getSignalStrength() {
		return mSignalStrength;
		}

core/java/android/net/NetworkRequest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package android.net;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.UnsupportedAppUsage;
		import android.net.NetworkCapabilities.NetCapability;
		import android.net.NetworkCapabilities.Transport;
		@@ -344,7 +345,7 @@ public class NetworkRequest implements Parcelable {
		* @param signalStrength the bearer-specific signal strength.
		* @hide
		*/
		@UnsupportedAppUsage
		@SystemApi
		public Builder setSignalStrength(int signalStrength) {
		mNetworkCapabilities.setSignalStrength(signalStrength);
		return this;