From 4bb5b458302964605bc50fff76ea4c14f325bdfb Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 17 Feb 2020 19:11:04 +0900 Subject: [PATCH] [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 --- .../java/com/android/server/connectivity/NetworkRanker.java | 2 +- tests/net/java/com/android/server/ConnectivityServiceTest.java | 2 +- .../java/com/android/server/connectivity/NetworkRankerTest.kt | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/connectivity/NetworkRanker.java b/services/core/java/com/android/server/connectivity/NetworkRanker.java index fd5a4e82de..80d46e0370 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 @@ public class NetworkRanker { 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 5aabc60b22..220cdce0d1 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -5846,7 +5846,7 @@ public class ConnectivityServiceTest { 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 2b0c2c7215..d2532c2ce3 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.filters.SmallTest 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