| commit | ff83b0e467094490e7f3b08bbff91d36a443a7ce | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Mon Feb 17 19:11:04 2020 +0900 |
| committer | Chalard Jean <jchalard@google.com> | Wed Feb 19 22:17:13 2020 +0900 |
| tree | a59666c5371e6d68c7761f6839d099fe75872fda | |
| parent | e9fd5a72298729c5ea46cadbea5ee89edfa06a90 [diff] |
[NS D07] Use the unmodified legacy score Ranking used to make use of the various adjustments in ConnectivityService. These are now implemented in policy. Test: ConnectivityServiceTest Change-Id: I56109847678ea5cda1752511123ba652c0f4fe36
diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/services/core/java/com/android/server/connectivity/NetworkRanker.java index fd5a4e8..80d46e0 100644 --- a/services/core/java/com/android/server/connectivity/NetworkRanker.java +++ b/services/core/java/com/android/server/connectivity/NetworkRanker.java
@@ -58,7 +58,7 @@ NetworkAgentInfo bestNetwork = null; int bestScore = Integer.MIN_VALUE; for (final NetworkAgentInfo nai : candidates) { - final int score = nai.getCurrentScore(); + final int score = nai.getNetworkScore().getLegacyScore(); if (score > bestScore) { bestNetwork = nai; bestScore = score;
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 5aabc60..220cdce 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -5846,7 +5846,7 @@ mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent.connect(true); - trustedCallback.expectAvailableDoubleValidatedCallbacks(mWiFiNetworkAgent); + trustedCallback.expectAvailableThenValidatedCallbacks(mWiFiNetworkAgent); verify(mNetworkManagementService).setDefaultNetId(eq(mWiFiNetworkAgent.getNetwork().netId)); reset(mNetworkManagementService);
diff --git a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt index 2b0c2c7..d2532c2 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt +++ b/tests/net/java/com/android/server/connectivity/NetworkRankerTest.kt
@@ -28,8 +28,6 @@ import androidx.test.runner.AndroidJUnit4 import org.junit.Test import org.junit.runner.RunWith -import org.mockito.ArgumentMatchers.any -import org.mockito.Mockito.doReturn import org.mockito.Mockito.mock import kotlin.test.assertEquals import kotlin.test.assertNull