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

Revert "[NS D03] Migrate the bad wifi avoidance policy"

Browse Source 
Revert submission 10338939

Reason for revert: The feature was punted out of R.
Reverted Changes:
I32c12702c:[NS D04] Implement a simple speed comparison betwe...
I688593cc0:[NS D03] Migrate the bad wifi avoidance policy

Change-Id: I640635a1ed94bed3b53466abe2a988caf0eca2b0
This commit is contained in:
Chalard Jean
2020-02-20 07:39:19 +00:00
parent 6f677ac620
commit 7b6b7ecc19
2 changed files with 2 additions and 27 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; 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.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.net.NetworkCapabilities;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import java.util.ArrayList; import java.util.ArrayList;
@@ -42,33 +37,15 @@ public class NetworkRanker {
@NonNull final Collection<NetworkAgentInfo> nais) { @NonNull final Collection<NetworkAgentInfo> nais) {
final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais); final ArrayList<NetworkAgentInfo> candidates = new ArrayList<>(nais);
candidates.removeIf(nai -> !nai.satisfies(request)); candidates.removeIf(nai -> !nai.satisfies(request));
// Enforce policy.
filterBadWifiAvoidancePolicy(candidates);
NetworkAgentInfo bestNetwork = null; NetworkAgentInfo bestNetwork = null;
int bestScore = Integer.MIN_VALUE; int bestScore = Integer.MIN_VALUE;
for (final NetworkAgentInfo nai : candidates) { for (final NetworkAgentInfo nai : candidates) {
final int score = nai.getCurrentScore(); if (nai.getCurrentScore() > bestScore) {
if (score > bestScore) {
bestNetwork = nai; bestNetwork = nai;
bestScore = score; bestScore = nai.getCurrentScore();
} }
} }
return bestNetwork; 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));
}
} }

2
tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
View File

@@ -16,7 +16,6 @@
package com.android.server.connectivity package com.android.server.connectivity
import android.net.NetworkCapabilities
import android.net.NetworkRequest import android.net.NetworkRequest
import androidx.test.filters.SmallTest import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
@@ -36,7 +35,6 @@ class NetworkRankerTest {
private fun makeNai(satisfy: Boolean, score: Int) = mock(NetworkAgentInfo::class.java).also { private fun makeNai(satisfy: Boolean, score: Int) = mock(NetworkAgentInfo::class.java).also {
doReturn(satisfy).`when`(it).satisfies(any()) doReturn(satisfy).`when`(it).satisfies(any())
doReturn(score).`when`(it).currentScore doReturn(score).`when`(it).currentScore
it.networkCapabilities = NetworkCapabilities()
} }
@Test @Test