Replace clearAll with withoutDefaultCapabilities in NC#Builder am: 6d8141caa1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/14518354

Change-Id: I872a9b2197c21e30f4a6e2aff8d4998f655d61c7

service-t/src/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();
 

service-t/src/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

tests/ethernet/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)