LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CS07]Remove hidden API usage of NetworkCapabilities am: 89f2f50aee

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e5b3ad03250e6afebbace7ff5b6431d136bfd0a
This commit is contained in:
lifr
2021-03-06 16:45:37 +00:00
committed by Automerger Merge Worker
parent 0c6adf259a 89f2f50aee
commit 1b5faa9f40
2 changed files with 30 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
service-t/src/com/android/server/ethernet/EthernetTracker.java
View File

@@ -459,7 +459,7 @@ final class EthernetTracker {
String transport = tokens.length > 3 ? tokens[3] : null; String transport = tokens.length > 3 ? tokens[3] : null;
NetworkCapabilities nc = createNetworkCapabilities( NetworkCapabilities nc = createNetworkCapabilities(
!TextUtils.isEmpty(capabilities) /* clear default capabilities */, capabilities, !TextUtils.isEmpty(capabilities) /* clear default capabilities */, capabilities,
transport); transport).build();
mNetworkCapabilities.put(name, nc); mNetworkCapabilities.put(name, nc);
if (tokens.length > 2 && !TextUtils.isEmpty(tokens[2])) { if (tokens.length > 2 && !TextUtils.isEmpty(tokens[2])) {
@@ -469,25 +469,26 @@ final class EthernetTracker {
} }
private static NetworkCapabilities createDefaultNetworkCapabilities(boolean isTestIface) { private static NetworkCapabilities createDefaultNetworkCapabilities(boolean isTestIface) {
NetworkCapabilities nc = createNetworkCapabilities(false /* clear default capabilities */); NetworkCapabilities.Builder builder = createNetworkCapabilities(
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); false /* clear default capabilities */, null, null)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED)
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED);
if (isTestIface) { if (isTestIface) {
nc.addTransportType(NetworkCapabilities.TRANSPORT_TEST); builder.addTransportType(NetworkCapabilities.TRANSPORT_TEST);
} else { } else {
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
} }
return nc; return builder.build();
} }
private static NetworkCapabilities createNetworkCapabilities(boolean clearDefaultCapabilities) { private static NetworkCapabilities createNetworkCapabilities(boolean clearDefaultCapabilities) {
return createNetworkCapabilities(clearDefaultCapabilities, null, null); return createNetworkCapabilities(clearDefaultCapabilities, null, null).build();
} }
/** /**
@@ -502,7 +503,7 @@ final class EthernetTracker {
* will cause the override to be ignored. * will cause the override to be ignored.
*/ */
@VisibleForTesting @VisibleForTesting
static NetworkCapabilities createNetworkCapabilities( static NetworkCapabilities.Builder createNetworkCapabilities(
boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities, boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities,
@Nullable String overrideTransport) { @Nullable String overrideTransport) {
@@ -566,7 +567,7 @@ final class EthernetTracker {
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED);
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
return builder.build(); return builder;
} }
/** /**

66
tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
View File

@@ -133,11 +133,11 @@ public class EthernetTrackerTest {
} }
} }
private NetworkCapabilitiesBuilder makeEthernetCapabilitiesBuilder(boolean clearAll) { private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) {
final NetworkCapabilitiesBuilder result = final NetworkCapabilities.Builder builder =
clearAll ? new NetworkCapabilitiesBuilder().clearAll() clearAll ? new NetworkCapabilities.Builder().clearAll()
: new NetworkCapabilitiesBuilder(); : new NetworkCapabilities.Builder();
return result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED)
.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED);
} }
@@ -153,14 +153,14 @@ public class EthernetTrackerTest {
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.build(); .build();
NetworkCapabilities ethernetClearedWithCommonCaps = NetworkCapabilities ethernetClearedWithCommonCaps =
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.addCapability(12) .addCapability(12)
.addCapability(13) .addCapability(13)
.addCapability(14) .addCapability(14)
@@ -177,7 +177,7 @@ public class EthernetTrackerTest {
makeEthernetCapabilitiesBuilder(false /* clearAll */) makeEthernetCapabilitiesBuilder(false /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.build(), .build(),
false, "", ""); false, "", "");
@@ -187,7 +187,7 @@ public class EthernetTrackerTest {
makeEthernetCapabilitiesBuilder(false /* clearAll */) makeEthernetCapabilitiesBuilder(false /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
.addCapability(11) .addCapability(11)
.addCapability(12) .addCapability(12)
.build(), .build(),
@@ -207,28 +207,28 @@ public class EthernetTrackerTest {
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(0) .addTransportType(0)
.build(), .build(),
true, "", "0"); true, "", "0");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(1) .addTransportType(1)
.build(), .build(),
true, "", "1"); true, "", "1");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(2) .addTransportType(2)
.build(), .build(),
true, "", "2"); true, "", "2");
assertParsedNetworkCapabilities( assertParsedNetworkCapabilities(
makeEthernetCapabilitiesBuilder(true /* clearAll */) makeEthernetCapabilitiesBuilder(true /* clearAll */)
.setLinkUpstreamBandwidthKbps(100000) .setLinkUpstreamBandwidthKbps(100000)
.setLinkDownstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000)
.addTransport(3) .addTransportType(3)
.build(), .build(),
true, "", "3"); true, "", "3");
@@ -256,7 +256,7 @@ public class EthernetTrackerTest {
.addCapability(13) .addCapability(13)
.addCapability(14) .addCapability(14)
.addCapability(15) .addCapability(15)
.addTransport(3) .addTransportType(3)
.build(), .build(),
true, "12,13,14,15", "3"); true, "12,13,14,15", "3");
@@ -268,42 +268,6 @@ public class EthernetTrackerTest {
boolean clearCapabilties, String configCapabiltiies,String configTransports) { boolean clearCapabilties, String configCapabiltiies,String configTransports) {
assertEquals(expectedNetworkCapabilities, assertEquals(expectedNetworkCapabilities,
EthernetTracker.createNetworkCapabilities(clearCapabilties, configCapabiltiies, EthernetTracker.createNetworkCapabilities(clearCapabilties, configCapabiltiies,
configTransports)); configTransports).build());
}
private static class NetworkCapabilitiesBuilder {
private final NetworkCapabilities nc = new NetworkCapabilities();
NetworkCapabilitiesBuilder clearAll(){
// This is THE ONLY one that doesn't return a reference to the object so I wrapped
// everything in a builder to keep things consistent and clean above. Fix if this
// ever changes
nc.clearAll();
return this;
}
NetworkCapabilitiesBuilder addCapability(int capability) {
nc.addCapability(capability);
return this;
}
NetworkCapabilitiesBuilder addTransport(int transport) {
nc.addTransportType(transport);
return this;
}
NetworkCapabilitiesBuilder setLinkUpstreamBandwidthKbps(int upKbps) {
nc.setLinkUpstreamBandwidthKbps(upKbps);
return this;
}
NetworkCapabilitiesBuilder setLinkDownstreamBandwidthKbps(int downKbps) {
nc.setLinkDownstreamBandwidthKbps(downKbps);
return this;
}
NetworkCapabilities build() {
return new NetworkCapabilities(nc);
}
} }
} }