Merge changes Ic4500dc8,I32477db5 into sc-dev

* changes: [NS12] Address comments on NS09 [NS11] Fix yieldToBadWifi over the policy scoring
2021-04-12 12:41:17 +00:00
parent 2066a2dc84 282037c2f0
commit 5b2817f17e
6 changed files with 55 additions and 26 deletions
--- a/tests/net/java/com/android/server/connectivity/FullScoreTest.kt
+++ b/tests/net/java/com/android/server/connectivity/FullScoreTest.kt
@@ -56,7 +56,7 @@ class FullScoreTest {
            if (vpn) addTransportType(NetworkCapabilities.TRANSPORT_VPN)
            if (validated) addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
        }.build()
-        return mixInScore(nc, nac, false /* avoidBadWifi */)
+        return mixInScore(nc, nac, validated, false /* yieldToBadWifi */)
    }

    @Test