Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf am: 1834461387

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870

Change-Id: Ib4318c685e4dd62ce68004041551e26437a8a631
This commit is contained in:
Chalard Jean
2021-03-16 07:07:59 +00:00
committed by Automerger Merge Worker

View File

@@ -81,7 +81,6 @@ import org.junit.Before
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.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.anyInt
import org.mockito.ArgumentMatchers.argThat import org.mockito.ArgumentMatchers.argThat
import org.mockito.ArgumentMatchers.eq import org.mockito.ArgumentMatchers.eq
import org.mockito.Mockito.doReturn import org.mockito.Mockito.doReturn
@@ -632,7 +631,7 @@ class NetworkAgentTest {
argThat<NetworkInfo> { it.detailedState == NetworkInfo.DetailedState.CONNECTING }, argThat<NetworkInfo> { it.detailedState == NetworkInfo.DetailedState.CONNECTING },
any(LinkProperties::class.java), any(LinkProperties::class.java),
any(NetworkCapabilities::class.java), any(NetworkCapabilities::class.java),
anyInt() /* score */, any() /* score */,
any(NetworkAgentConfig::class.java), any(NetworkAgentConfig::class.java),
eq(NetworkProvider.ID_NONE)) eq(NetworkProvider.ID_NONE))
} }