| commit | 74575961f9d4460ec38329cb9150cd4277e087fc | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon May 17 02:29:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 17 02:29:35 2021 +0000 |
| tree | 43175630c6f2230b261f348bcdf385f263b9faa1 | |
| parent | d44d73c9674bb21a4afc339d317ee6a1b8b391b6 [diff] | |
| parent | ca8079ec689021c0f1a2d2f06603bcf643b2381f [diff] |
Replace clearAll with withoutDefaultCapabilities in NC#Builder am: ca8079ec68 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/1708167 Change-Id: Ibfd7bab3186ebde177e968ba86962655bee49841
diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java index f9e8b00..aa80e4d 100644 --- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -167,8 +167,8 @@ } private void updateCapabilityFilter() { - NetworkCapabilities capabilitiesFilter = new NetworkCapabilities.Builder() - .clearAll() + NetworkCapabilities capabilitiesFilter = + NetworkCapabilities.Builder.withoutDefaultCapabilities() .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET) .build();
diff --git a/service-t/src/com/android/server/ethernet/EthernetTracker.java b/service-t/src/com/android/server/ethernet/EthernetTracker.java index a190240..b2b60fc 100644 --- a/service-t/src/com/android/server/ethernet/EthernetTracker.java +++ b/service-t/src/com/android/server/ethernet/EthernetTracker.java
@@ -507,10 +507,9 @@ 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/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java index 22b1b69..ee9f349 100644 --- a/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java +++ b/tests/ethernet/java/com/android/server/ethernet/EthernetTrackerTest.java
@@ -107,7 +107,7 @@ 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)