diff options
author | lifr <lifr@google.com> | 2021-03-06 16:45:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-06 16:45:37 +0000 |
commit | 5f6d08c27d24dcaab489b0befffbec1bd209b5ad (patch) | |
tree | 91a3d7f4c259df91df25d03ad7d907a39a5f1b55 | |
parent | 02bdbdde293f41166c56839eb10770d543601303 (diff) | |
parent | e7af881e161f8a67ac17d17f32b6095cde2ed325 (diff) | |
download | ethernet-5f6d08c27d24dcaab489b0befffbec1bd209b5ad.tar.gz |
[CS07]Remove hidden API usage of NetworkCapabilities am: e7af881e16
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1614962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e5b3ad03250e6afebbace7ff5b6431d136bfd0a
-rw-r--r-- | java/com/android/server/ethernet/EthernetTracker.java | 29 | ||||
-rw-r--r-- | tests/java/com/android/server/ethernet/EthernetTrackerTest.java | 66 |
2 files changed, 30 insertions, 65 deletions
diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java index 05b2782..a831f34 100644 --- a/java/com/android/server/ethernet/EthernetTracker.java +++ b/java/com/android/server/ethernet/EthernetTracker.java @@ -459,7 +459,7 @@ final class EthernetTracker { String transport = tokens.length > 3 ? tokens[3] : null; NetworkCapabilities nc = createNetworkCapabilities( !TextUtils.isEmpty(capabilities) /* clear default capabilities */, capabilities, - transport); + transport).build(); mNetworkCapabilities.put(name, nc); if (tokens.length > 2 && !TextUtils.isEmpty(tokens[2])) { @@ -469,25 +469,26 @@ final class EthernetTracker { } private static NetworkCapabilities createDefaultNetworkCapabilities(boolean isTestIface) { - NetworkCapabilities nc = createNetworkCapabilities(false /* clear default capabilities */); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED); + NetworkCapabilities.Builder builder = createNetworkCapabilities( + false /* clear default capabilities */, null, null) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED) + .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED); if (isTestIface) { - nc.addTransportType(NetworkCapabilities.TRANSPORT_TEST); + builder.addTransportType(NetworkCapabilities.TRANSPORT_TEST); } else { - nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); + builder.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET); } - return nc; + return builder.build(); } 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. */ @VisibleForTesting - static NetworkCapabilities createNetworkCapabilities( + static NetworkCapabilities.Builder createNetworkCapabilities( boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities, @Nullable String overrideTransport) { @@ -566,7 +567,7 @@ final class EthernetTracker { builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED); builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); - return builder.build(); + return builder; } /** diff --git a/tests/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java index 1218788..43571bb 100644 --- a/tests/java/com/android/server/ethernet/EthernetTrackerTest.java +++ b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java @@ -133,11 +133,11 @@ public class EthernetTrackerTest { } } - private NetworkCapabilitiesBuilder makeEthernetCapabilitiesBuilder(boolean clearAll) { - final NetworkCapabilitiesBuilder result = - clearAll ? new NetworkCapabilitiesBuilder().clearAll() - : new NetworkCapabilitiesBuilder(); - return result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) + private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) { + final NetworkCapabilities.Builder builder = + clearAll ? new NetworkCapabilities.Builder().clearAll() + : new NetworkCapabilities.Builder(); + return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED); } @@ -153,14 +153,14 @@ public class EthernetTrackerTest { makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .build(); NetworkCapabilities ethernetClearedWithCommonCaps = makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .addCapability(12) .addCapability(13) .addCapability(14) @@ -177,7 +177,7 @@ public class EthernetTrackerTest { makeEthernetCapabilitiesBuilder(false /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .build(), false, "", ""); @@ -187,7 +187,7 @@ public class EthernetTrackerTest { makeEthernetCapabilitiesBuilder(false /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(NetworkCapabilities.TRANSPORT_ETHERNET) + .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .addCapability(11) .addCapability(12) .build(), @@ -207,28 +207,28 @@ public class EthernetTrackerTest { makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(0) + .addTransportType(0) .build(), true, "", "0"); assertParsedNetworkCapabilities( makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(1) + .addTransportType(1) .build(), true, "", "1"); assertParsedNetworkCapabilities( makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(2) + .addTransportType(2) .build(), true, "", "2"); assertParsedNetworkCapabilities( makeEthernetCapabilitiesBuilder(true /* clearAll */) .setLinkUpstreamBandwidthKbps(100000) .setLinkDownstreamBandwidthKbps(100000) - .addTransport(3) + .addTransportType(3) .build(), true, "", "3"); @@ -256,7 +256,7 @@ public class EthernetTrackerTest { .addCapability(13) .addCapability(14) .addCapability(15) - .addTransport(3) + .addTransportType(3) .build(), true, "12,13,14,15", "3"); @@ -268,42 +268,6 @@ public class EthernetTrackerTest { boolean clearCapabilties, String configCapabiltiies,String configTransports) { assertEquals(expectedNetworkCapabilities, EthernetTracker.createNetworkCapabilities(clearCapabilties, configCapabiltiies, - configTransports)); - } - - 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); - } + configTransports).build()); } } |