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

Revert "[NS D07] Use the unmodified legacy score"

Browse Source 
Revert submission 10343065

Reason for revert: This is part of a feature that was punted out of R.
Reverted Changes:
Ic9a3d3363:[NS D05] Rework how to tear down networks
I7d815f873:[NS D06] Implement more policies
I561098476:[NS D07] Use the unmodified legacy score

Change-Id: I184817e3aa290afdbe6721a7c36332b940434d3a
This commit is contained in:
Chalard Jean
2020-02-20 07:32:12 +00:00
parent 4bb5b45830
commit b104cd7c12
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class NetworkRanker {
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.getNetworkScore().getLegacyScore(); final int score = nai.getCurrentScore();
if (score > bestScore) { if (score > bestScore) {
bestNetwork = nai; bestNetwork = nai;
bestScore = score; bestScore = score;

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -5846,7 +5846,7 @@ public class ConnectivityServiceTest {
mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(true); mWiFiNetworkAgent.connect(true);
trustedCallback.expectAvailableThenValidatedCallbacks(mWiFiNetworkAgent); trustedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent);
verify(mNetworkManagementService).setDefaultNetId(eq(mWiFiNetworkAgent.getNetwork().netId)); verify(mNetworkManagementService).setDefaultNetId(eq(mWiFiNetworkAgent.getNetwork().netId));
reset(mNetworkManagementService); reset(mNetworkManagementService);

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

@@ -28,6 +28,8 @@ import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito.doReturn
import org.mockito.Mockito.mock import org.mockito.Mockito.mock
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNull import kotlin.test.assertNull