diff options
| author | paulhu <paulhu@google.com> | 2020-12-29 18:15:13 +0800 |
|---|---|---|
| committer | Aaron Huang <huangaaron@google.com> | 2021-01-05 17:47:25 +0800 |
| commit | 53c4fc75a53fc6c2b3f9c7ee6d24c5d15decdec0 (patch) | |
| tree | 2fd3179fa48b6b4ae69ea05c90e61a9fc69d6123 /tests/net/integration | |
| parent | e4f60f7dffe48520a465cd16f0ab970b1e0a9ad9 (diff) | |
Replace INetworkPolicyManager to NetworkPolicyManager
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. Thus, use formal API
Context#getSystemService() to get network policy service instead
of hidden API ServiceManager#getService().
Bug: 170598012
Test: atest FrameworksNetTests FrameworksNetIntegrationTests
Change-Id: I4f286264b5800b2b922f85a76ddd20d64d53000a
Diffstat (limited to 'tests/net/integration')
| -rw-r--r-- | tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt b/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt index 70f6386aa891..8e1875168a84 100644 --- a/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt +++ b/tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt @@ -25,7 +25,6 @@ import android.content.ServiceConnection import android.net.ConnectivityManager import android.net.IDnsResolver import android.net.INetd -import android.net.INetworkPolicyManager import android.net.INetworkStatsService import android.net.LinkProperties import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL @@ -88,8 +87,6 @@ class ConnectivityServiceIntegrationTest { @Mock private lateinit var statsService: INetworkStatsService @Mock - private lateinit var policyManager: INetworkPolicyManager - @Mock private lateinit var log: IpConnectivityLog @Mock private lateinit var netd: INetd @@ -171,7 +168,7 @@ class ConnectivityServiceIntegrationTest { } private inner class TestConnectivityService(deps: Dependencies) : ConnectivityService( - context, netManager, statsService, policyManager, dnsResolver, log, netd, deps) + context, netManager, statsService, dnsResolver, log, netd, deps) private fun makeDependencies(): ConnectivityService.Dependencies { val deps = spy(ConnectivityService.Dependencies()) |