diff options
author | Chiachang Wang <chiachangwang@google.com> | 2021-05-13 10:21:59 +0800 |
---|---|---|
committer | Chiachang Wang <chiachangwang@google.com> | 2021-05-14 14:24:21 +0800 |
commit | 364fadcad2f54621ff8f363fb5315a85cd5d98c8 (patch) | |
tree | 478aeeb9f6062e8be37aef0ac21ee947985366d4 | |
parent | 051df1e81e9ba5fa78997b08f25dff918513c496 (diff) | |
download | ethernet-364fadcad2f54621ff8f363fb5315a85cd5d98c8.tar.gz |
Replace clearAll with withoutDefaultCapabilities in NC#Builder
Update the naming and usgae according to API review feedback.
Bug: 184735772
Test: atest EthernetTrackerTest
Change-Id: Ie8dc0bcdf46ceebda5d6062231b48c1f63b250f6
3 files changed, 6 insertions, 7 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index f9e8b00..aa80e4d 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -167,8 +167,8 @@ public class EthernetNetworkFactory extends NetworkFactory { } private void updateCapabilityFilter() { - NetworkCapabilities capabilitiesFilter = new NetworkCapabilities.Builder() - .clearAll() + NetworkCapabilities capabilitiesFilter = + NetworkCapabilities.Builder.withoutDefaultCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .build(); diff --git a/java/com/android/server/ethernet/EthernetTracker.java b/java/com/android/server/ethernet/EthernetTracker.java index a190240..b2b60fc 100644 --- a/java/com/android/server/ethernet/EthernetTracker.java +++ b/java/com/android/server/ethernet/EthernetTracker.java @@ -507,10 +507,9 @@ final class EthernetTracker { boolean clearDefaultCapabilities, @Nullable String commaSeparatedCapabilities, @Nullable String overrideTransport) { - final NetworkCapabilities.Builder builder = new NetworkCapabilities.Builder(); - if (clearDefaultCapabilities) { - builder.clearAll(); // Remove default capabilities and transports - } + final NetworkCapabilities.Builder builder = clearDefaultCapabilities + ? NetworkCapabilities.Builder.withoutDefaultCapabilities() + : new NetworkCapabilities.Builder(); // Determine the transport type. If someone has tried to define an override transport then // attempt to add it. Since we can only have one override, all errors with it will diff --git a/tests/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java index 22b1b69..ee9f349 100644 --- a/tests/java/com/android/server/ethernet/EthernetTrackerTest.java +++ b/tests/java/com/android/server/ethernet/EthernetTrackerTest.java @@ -107,7 +107,7 @@ public class EthernetTrackerTest { private NetworkCapabilities.Builder makeEthernetCapabilitiesBuilder(boolean clearAll) { final NetworkCapabilities.Builder builder = - clearAll ? new NetworkCapabilities.Builder().clearAll() + clearAll ? NetworkCapabilities.Builder.withoutDefaultCapabilities() : new NetworkCapabilities.Builder(); return builder.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_ROAMING) .addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_CONGESTED) |