commit d598031a8ea60abf5f3f5c3a4a3eeab0bb88c3e3
author Chiachang Wang <chiachangwang@google.com> Fri May 14 09:32:47 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 14 09:32:47 2021 +0000
tree 52d8b334af6b14a5b63fb21cf6970637b5dfee20
parent 059eb44e9f91a17e051a1ef9c75f727b54d7b39e
parent 3468c1fc8b81f661d7db30e3ec5918d8d0b0a2cc

Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev

staticlibs/device/android/net/NetworkFactoryImpl.java

diff --git a/staticlibs/device/android/net/NetworkFactoryImpl.java b/staticlibs/device/android/net/NetworkFactoryImpl.java
index a337351..439ea14 100644
--- a/staticlibs/device/android/net/NetworkFactoryImpl.java
+++ b/staticlibs/device/android/net/NetworkFactoryImpl.java
@@ -130,7 +130,8 @@
     NetworkFactoryImpl(NetworkFactory parent, Looper looper, Context context,
             @Nullable final NetworkCapabilities filter) {
         super(parent, looper, context,
-                null != filter ? filter : new NetworkCapabilities.Builder().clearAll().build());
+                null != filter ? filter :
+                        NetworkCapabilities.Builder.withoutDefaultCapabilities().build());
     }
 
     /* Registers this NetworkFactory with the system. May only be called once per factory. */