Merge "src_frameworkcommon: Fix filegroup base path"
diff --git a/staticlibs/src_servicescommon/android/net/NetworkFactory.java b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
index 9bcc863..06399f8 100644
--- a/staticlibs/src_servicescommon/android/net/NetworkFactory.java
+++ b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
@@ -132,7 +132,7 @@
             }
 
             @Override
-            public void onRequestWithdrawn(@NonNull NetworkRequest request) {
+            public void onNetworkRequestWithdrawn(@NonNull NetworkRequest request) {
                 handleRemoveRequest(request);
             }
         };
@@ -319,7 +319,7 @@
             && (n.score < mScore || n.providerId == mProvider.getProviderId())
             // If this factory can't satisfy the capability needs of this request, then it
             // should not be tracked.
-            && n.request.satisfiedBy(mCapabilityFilter)
+            && n.request.canBeSatisfiedBy(mCapabilityFilter)
             // Finally if the concrete implementation of the factory rejects the request, then
             // don't track it.
             && acceptRequest(n.request, n.score);
@@ -335,7 +335,7 @@
             // - This factory can't satisfy the capability needs of the request
             // - The concrete implementation of the factory rejects the request
             && ((n.score > mScore && n.providerId != mProvider.getProviderId())
-                    || !n.request.satisfiedBy(mCapabilityFilter)
+                    || !n.request.canBeSatisfiedBy(mCapabilityFilter)
                     || !acceptRequest(n.request, n.score));
     }