LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from topic "revert-10338939-YCRBMILGZV"

Browse Source 
* changes:
  Revert "[NS D03] Migrate the bad wifi avoidance policy"
  Revert "[NS D04] Implement a simple speed comparison between scores."
This commit is contained in:
TreeHugger Robot
2020-02-21 08:51:09 +00:00
committed by Android (Google) Code Review
parent 77eea40def 12dcdccc4f
commit fede1237e0
3 changed files with 2 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
services/core/java/com/android/server/connectivity/NetworkRanker.java
View File

@@ -16,13 +16,8 @@
package com.android.server.connectivity;
import static android.net.NetworkScore.POLICY_IGNORE_ON_WIFI;
import static com.android.internal.util.FunctionalUtils.findFirst;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest;
import java.util.ArrayList;
@@ -42,33 +37,15 @@ public class NetworkRanker {
@NonNull final Collection<NetworkAgentInfo> nais) {
final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais);
candidates.removeIf(nai -> !nai.satisfies(request));
// Enforce policy.
filterBadWifiAvoidancePolicy(candidates);
NetworkAgentInfo bestNetwork = null;
int bestScore = Integer.MIN_VALUE;
for (final NetworkAgentInfo nai : candidates) {
final int score = nai.getCurrentScore();
if (score > bestScore) {
if (nai.getCurrentScore() > bestScore) {
bestNetwork = nai;
bestScore = score;
bestScore = nai.getCurrentScore();
}
}
return bestNetwork;
}
// If some network with wifi transport is present, drop all networks with POLICY_IGNORE_ON_WIFI.
private void filterBadWifiAvoidancePolicy(
@NonNull final ArrayList<NetworkAgentInfo> candidates) {
final NetworkAgentInfo wifi = findFirst(candidates,
nai -> nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
&& nai.everValidated
// Horrible hack : there is old UI that will let a user say they want to
// override the policy only for this network only at this time and it
// feeds into the following member. This old UI should probably be removed
// but for now keep backward compatibility.
&& !nai.avoidUnvalidated);
if (null == wifi) return; // No wifi : this policy doesn't apply
candidates.removeIf(nai -> nai.getNetworkScore().hasPolicy(POLICY_IGNORE_ON_WIFI));
}
}