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

Remove the legacy int policy from NetworkRanker

Browse Source 
This code is now dead and can't be resurrected. It can safely
be removed.

Test: FrameworksNetTests
Change-Id: I7bc2ce3d43a92e463b6aed73914c3f7a3a0c8103
This commit is contained in:
Chalard Jean
2021-11-30 20:00:55 +09:00
parent 44a20af4a3
commit 132ff9ef2e
1 changed files with 7 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
service/src/com/android/server/connectivity/NetworkRanker.java
View File

@@ -63,8 +63,6 @@ public class NetworkRanker {
NetworkCapabilities getCapsNoCopy(); NetworkCapabilities getCapsNoCopy();
} }
private static final boolean USE_POLICY_RANKING = true;
public NetworkRanker() { } public NetworkRanker() { }
/** /**
@@ -77,11 +75,7 @@ public class NetworkRanker {
final ArrayList<NetworkAgentInfo> candidates = filter(nais, nai -> nai.satisfies(request)); final ArrayList<NetworkAgentInfo> candidates = filter(nais, nai -> nai.satisfies(request));
if (candidates.size() == 1) return candidates.get(0); // Only one potential satisfier if (candidates.size() == 1) return candidates.get(0); // Only one potential satisfier
if (candidates.size() <= 0) return null; // No network can satisfy this request if (candidates.size() <= 0) return null; // No network can satisfy this request
if (USE_POLICY_RANKING) {
return getBestNetworkByPolicy(candidates, currentSatisfier); return getBestNetworkByPolicy(candidates, currentSatisfier);
} else {
return getBestNetworkByLegacyInt(candidates);
}
} }
// Transport preference order, if it comes down to that. // Transport preference order, if it comes down to that.
@@ -278,23 +272,6 @@ public class NetworkRanker {
return candidates.get(0); return candidates.get(0);
} }
// TODO : switch to the policy implementation and remove
// Almost equivalent to Collections.max(nais), but allows returning null if no network
// satisfies the request.
private NetworkAgentInfo getBestNetworkByLegacyInt(
@NonNull final Collection<NetworkAgentInfo> nais) {
NetworkAgentInfo bestNetwork = null;
int bestScore = Integer.MIN_VALUE;
for (final NetworkAgentInfo nai : nais) {
final int naiScore = nai.getCurrentScore();
if (naiScore > bestScore) {
bestNetwork = nai;
bestScore = naiScore;
}
}
return bestNetwork;
}
/** /**
* Returns whether a {@link Scoreable} has a chance to beat a champion network for a request. * Returns whether a {@link Scoreable} has a chance to beat a champion network for a request.
* *
@@ -322,30 +299,11 @@ public class NetworkRanker {
// If there is no satisfying network, then this network can beat, because some network // If there is no satisfying network, then this network can beat, because some network
// is always better than no network. // is always better than no network.
if (null == champion) return true; if (null == champion) return true;
if (USE_POLICY_RANKING) {
// If there is no champion, the offer can always beat. // If there is no champion, the offer can always beat.
// Otherwise rank them. // Otherwise rank them.
final ArrayList<Scoreable> candidates = new ArrayList<>(); final ArrayList<Scoreable> candidates = new ArrayList<>();
candidates.add(champion); candidates.add(champion);
candidates.add(contestant); candidates.add(contestant);
return contestant == getBestNetworkByPolicy(candidates, champion); return contestant == getBestNetworkByPolicy(candidates, champion);
} else {
return mightBeatByLegacyInt(champion.getScore(), contestant);
}
}
/**
* Returns whether a contestant might beat a champion according to the legacy int.
*/
private boolean mightBeatByLegacyInt(@Nullable final FullScore championScore,
@NonNull final Scoreable contestant) {
final int offerIntScore;
if (contestant.getCapsNoCopy().hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
// If the offer might have Internet access, then it might validate.
offerIntScore = contestant.getScore().getLegacyIntAsValidated();
} else {
offerIntScore = contestant.getScore().getLegacyInt();
}
return championScore.getLegacyInt() < offerIntScore;
} }
} }