Unhide LinkProperties, NetworkCapabilities, NetworkRequest APIs

These methods are marked to @UnsupportedAppUsage APIs since
Android Q. But some system apps still need them to set/get
necessary network or request information. Hence, make them to be
public or system APIs.

Bug: 120448492
Test: atest FrameworksNetTests
Change-Id: I95a44daef5615e290b40d0796ca183b88ad8a63f
This commit is contained in:
paulhu
2018-12-12 17:52:57 +08:00
committed by Paul Hu
parent 821c97863f
commit 058120dbc2
3 changed files with 13 additions and 13 deletions

View File

@@ -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();

View File

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

View File

@@ -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;