[automerger skipped] Update NetworkProvider calls for API council request am: da28db7797 am: b0a0e358c7 -s ours
am skip reason: Change-Id Iec50554a9548a5cbdcf556a1a0536d9a94559793 with SHA-1 ad2d1da74c is in history
Change-Id: Ib59544772bfedca25ab66d3265c7d41bea8f5551
diff --git a/staticlibs/src_servicescommon/android/net/NetworkFactory.java b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
index 252c2ea..06399f8 100644
--- a/staticlibs/src_servicescommon/android/net/NetworkFactory.java
+++ b/staticlibs/src_servicescommon/android/net/NetworkFactory.java
@@ -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));
}