Merge "Style improvements to removeDefaultNetworkRequests." into main
This commit is contained in:
commit
4f3632b57f
1 changed files with 5 additions and 5 deletions
|
|
@ -14613,12 +14613,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||
}
|
||||
}
|
||||
|
||||
/** Removes all default network requests matching the specified filter. */
|
||||
private void removeDefaultNetworkRequests(Predicate<NetworkRequestInfo> filter) {
|
||||
// Skip the requests which are set by other network preference. Because the uid range rules
|
||||
// should stay in netd.
|
||||
final Set<NetworkRequestInfo> requests = new ArraySet<>(mDefaultNetworkRequests);
|
||||
requests.removeIf(filter.negate());
|
||||
handleRemoveNetworkRequests(requests);
|
||||
// Remove all requests in mDefaultNetworkRequests except the ones that match the filter.
|
||||
final Set<NetworkRequestInfo> toRemove = new ArraySet<>(mDefaultNetworkRequests);
|
||||
toRemove.removeIf(filter.negate());
|
||||
handleRemoveNetworkRequests(toRemove);
|
||||
}
|
||||
|
||||
private void removeDefaultNetworkRequestsForPreference(final int preferenceOrder) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue