diff options
| author | markchien <markchien@google.com> | 2019-12-16 20:15:20 +0800 |
|---|---|---|
| committer | markchien <markchien@google.com> | 2019-12-19 20:53:06 +0800 |
| commit | 6d06f6d51a568b5578584cc91340dbc2f2b0e6ac (patch) | |
| tree | 0ed904065bc522da5d93c66b52042467cbfca4b1 /tests/net/integration | |
| parent | 7b2a29361c537feb44faa876f064c76e3a848ea9 (diff) | |
[Tether13] Move TetheringManager into framework
Move tethering out of ConnectivityService. All client would
use TetheringManager to talk with TetheringService directly.
Bug: 144320246
Test: -build, flash, boot
-atest TetheringTests
Change-Id: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Merged-In: Ib051bea724a256f9c4572b566e46ae7b9c4abe6e
Diffstat (limited to 'tests/net/integration')
| -rw-r--r-- | tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt | 2 |
1 files changed, 0 insertions, 2 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 25028fb3ca0e..c4801aab5c32 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 @@ -32,7 +32,6 @@ import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET import android.net.NetworkCapabilities.TRANSPORT_CELLULAR import android.net.NetworkRequest import android.net.TestNetworkStackClient -import android.net.TetheringManager import android.net.metrics.IpConnectivityLog import android.os.ConditionVariable import android.os.IBinder @@ -169,7 +168,6 @@ class ConnectivityServiceIntegrationTest { val deps = spy(ConnectivityService.Dependencies()) doReturn(networkStackClient).`when`(deps).networkStack doReturn(metricsLogger).`when`(deps).metricsLogger - doReturn(mock(TetheringManager::class.java)).`when`(deps).getTetheringManager() doReturn(mock(ProxyTracker::class.java)).`when`(deps).makeProxyTracker(any(), any()) doReturn(mock(MockableSystemProperties::class.java)).`when`(deps).systemProperties doReturn(TestNetIdManager()).`when`(deps).makeNetIdManager() |