Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e

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

Change-Id: Ib378623e1eecf63f14bd99e70cc9af00aba1baf5
This commit is contained in:
Remi NGUYEN VAN
2021-06-11 01:56:50 +00:00
committed by Automerger Merge Worker
9 changed files with 18 additions and 52 deletions

View File

@@ -74,7 +74,6 @@ class MultinetworkPolicyTrackerTest {
doReturn(Context.TELEPHONY_SERVICE).`when`(it)
.getSystemServiceName(TelephonyManager::class.java)
doReturn(telephonyManager).`when`(it).getSystemService(Context.TELEPHONY_SERVICE)
doReturn(telephonyManager).`when`(it).getSystemService(TelephonyManager::class.java)
doReturn(subscriptionManager).`when`(it)
.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE)
doReturn(resolver).`when`(it).contentResolver