| commit | 8a2a08b01d7d45bc9737b6795cce8b1203c3a1af | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Mar 21 17:37:34 2025 -0700 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 21 17:37:34 2025 -0700 |
| tree | 551886aa63b115a7c06c0b481d25455afc376dd7 | |
| parent | 64c00aa2546cb04a45c957df49455234c7bb9521 [diff] | |
| parent | b19b6d74b7eeab7f2e0b186cf39c1051e0987a73 [diff] |
Merge "Don't use NetworkScore in TestableNetworkAgent" into main am: b19b6d74b7 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3555852 Change-Id: I3191ae158d634ee0480a329d9eb60ea1545ac9d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkAgent.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkAgent.kt index f5f2e69..1a82c5b 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkAgent.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/TestableNetworkAgent.kt
@@ -73,7 +73,9 @@ // Any legal score (0~99) for the test network would do, as it is going to be kept up by the // requests filed by the test and should never match normal internet requests. 70 is the default // score of Ethernet networks, it's as good a value as any other. -private val TEST_NETWORK_SCORE = NetworkScore.Builder().setLegacyInt(70).build() +// Note that this can't use NetworkScore.Builder() because this test must be able to +// run on R, which doesn't know this class. +private const val TEST_NETWORK_SCORE = 70 private class Provider(context: Context, looper: Looper) : NetworkProvider(context, looper, "NetworkAgentTest NetworkProvider")