Create a builder for NetworkCapabilities. am: e5e385020c am: aebf29d03a (c808618d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -30256,9 +30256,6 @@ package android.net {
		public final class NetworkCapabilities implements android.os.Parcelable {
		ctor public NetworkCapabilities();
		ctor public NetworkCapabilities(android.net.NetworkCapabilities);
		method @NonNull public android.net.NetworkCapabilities addCapability(int);
		method @NonNull public android.net.NetworkCapabilities addTransportType(int);
		method public void clearAll();
		method public int describeContents();
		method public int getLinkDownstreamBandwidthKbps();
		method public int getLinkUpstreamBandwidthKbps();
		@@ -30268,13 +30265,6 @@ package android.net {
		method @Nullable public android.net.TransportInfo getTransportInfo();
		method public boolean hasCapability(int);
		method public boolean hasTransport(int);
		method @NonNull public android.net.NetworkCapabilities removeCapability(int);
		method @NonNull public android.net.NetworkCapabilities setCapability(int, boolean);
		method @NonNull public android.net.NetworkCapabilities setLinkDownstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities setLinkUpstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities setNetworkSpecifier(@NonNull android.net.NetworkSpecifier);
		method @NonNull public android.net.NetworkCapabilities setOwnerUid(int);
		method @NonNull public android.net.NetworkCapabilities setSignalStrength(int);
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkCapabilities> CREATOR;
		field public static final int NET_CAPABILITY_CAPTIVE_PORTAL = 17; // 0x11

api/system-current.txt

+21 −6

Original line number	Diff line number	Diff line
		@@ -6308,18 +6308,33 @@ package android.net {

		public final class NetworkCapabilities implements android.os.Parcelable {
		method @NonNull public int[] getAdministratorUids();
		method @Nullable public String getSSID();
		method @Nullable public String getSsid();
		method @NonNull public int[] getTransportTypes();
		method public boolean satisfiedByNetworkCapabilities(@Nullable android.net.NetworkCapabilities);
		method @NonNull public android.net.NetworkCapabilities setAdministratorUids(@NonNull int[]);
		method @NonNull public android.net.NetworkCapabilities setRequestorPackageName(@NonNull String);
		method @NonNull public android.net.NetworkCapabilities setRequestorUid(int);
		method @NonNull public android.net.NetworkCapabilities setSSID(@Nullable String);
		method @NonNull public android.net.NetworkCapabilities setTransportInfo(@NonNull android.net.TransportInfo);
		field public static final int NET_CAPABILITY_OEM_PAID = 22; // 0x16
		field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18
		}

		public static class NetworkCapabilities.Builder {
		ctor public NetworkCapabilities.Builder();
		ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);
		method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);
		method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int);
		method @NonNull public android.net.NetworkCapabilities build();
		method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int);
		method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]);
		method @NonNull public android.net.NetworkCapabilities.Builder setLinkDownstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities.Builder setLinkUpstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities.Builder setNetworkSpecifier(@Nullable android.net.NetworkSpecifier);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setOwnerUid(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorPackageName(@Nullable String);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setRequestorUid(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP) public android.net.NetworkCapabilities.Builder setSignalStrength(int);
		method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);
		method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
		}

		public class NetworkKey implements android.os.Parcelable {
		ctor public NetworkKey(android.net.WifiKey);
		method @Nullable public static android.net.NetworkKey createFromScanResult(@NonNull android.net.wifi.ScanResult);

api/test-current.txt

+22 −0

Original line number	Diff line number	Diff line
		@@ -1824,12 +1824,34 @@ package android.net {
		}

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

		public static class NetworkCapabilities.Builder {
		ctor public NetworkCapabilities.Builder();
		ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);
		method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);
		method @NonNull public android.net.NetworkCapabilities.Builder addTransportType(int);
		method @NonNull public android.net.NetworkCapabilities build();
		method @NonNull public android.net.NetworkCapabilities.Builder removeCapability(int);
		method @NonNull public android.net.NetworkCapabilities.Builder removeTransportType(int);
		method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setAdministratorUids(@NonNull int[]);
		method @NonNull public android.net.NetworkCapabilities.Builder setLinkDownstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities.Builder setLinkUpstreamBandwidthKbps(int);
		method @NonNull public android.net.NetworkCapabilities.Builder setNetworkSpecifier(@Nullable android.net.NetworkSpecifier);
		method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setOwnerUid(int);
		method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setRequestorPackageName(@Nullable String);
		method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setRequestorUid(int);
		method @NonNull @RequiresPermission("android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP") public android.net.NetworkCapabilities.Builder setSignalStrength(int);
		method @NonNull @RequiresPermission("android.permission.NETWORK_FACTORY") public android.net.NetworkCapabilities.Builder setSsid(@Nullable String);
		method @NonNull public android.net.NetworkCapabilities.Builder setTransportInfo(@Nullable android.net.TransportInfo);
		}

		public class NetworkStack {
		method @Nullable public static android.os.IBinder getService();
		method public static void setServiceForTest(@Nullable android.os.IBinder);

core/java/android/net/NetworkCapabilities.java

+366 −41

File changed.

Preview size limit exceeded, changes collapsed.

packages/Tethering/src/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -586,21 +586,21 @@ public class UpstreamNetworkMonitor {
		*/
		@VisibleForTesting
		public static NetworkCapabilities networkCapabilitiesForType(int type) {
		final NetworkCapabilities nc = new NetworkCapabilities();
		final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder();

		// Map from type to transports.
		final int notFound = -1;
		final int transport = sLegacyTypeToTransport.get(type, notFound);
		Preconditions.checkArgument(transport != notFound, "unknown legacy type: " + type);
		nc.addTransportType(transport);
		builder.addTransportType(transport);

		if (type == TYPE_MOBILE_DUN) {
		nc.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN);
		builder.addCapability(NetworkCapabilities.NET_CAPABILITY_DUN);
		// DUN is restricted network, see NetworkCapabilities#FORCE_RESTRICTED_CAPABILITIES.
		nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
		builder.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
		} else {
		nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
		}
		return nc;
		return builder.build();
		}
		}