summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-03 03:21:10 +0000
committerChiachang Wang <chiachangwang@google.com>2020-03-03 05:18:43 +0000
commit37c22fc62bb0d69bd7c28fd2f1e6e4d7bf941dcf (patch)
tree07a7548b4bdb14a3505ed628499ebc9619788caf
parenta495776feec32727b3db24c8b48eddcb4810bba4 (diff)
Remove unused NetworkInfo
Bug: 127603877 Test: atest NetworkStackTests Change-Id: Iec1150e1166c7e8cf92de9b1e6d4874f5f5bd431 Merged-In: Iec1150e1166c7e8cf92de9b1e6d4874f5f5bd431 (cherry picked from commit a4c99e4a7076832744ba23868b05d3a775b5ad60) (Original aosp commit aosp/1247410)
-rw-r--r--tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
index 98fa147..a81cacd 100644
--- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -94,7 +94,6 @@ import android.net.INetworkMonitorCallbacks;
import android.net.LinkProperties;
import android.net.Network;
import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
import android.net.Uri;
import android.net.captiveportal.CaptivePortalProbeResult;
import android.net.metrics.IpConnectivityLog;
@@ -179,7 +178,6 @@ public class NetworkMonitorTest {
private @Mock Resources mResources;
private @Mock IpConnectivityLog mLogger;
private @Mock SharedLog mValidationLogger;
- private @Mock NetworkInfo mNetworkInfo;
private @Mock DnsResolver mDnsResolver;
private @Mock ConnectivityManager mCm;
private @Mock TelephonyManager mTelephony;
@@ -419,7 +417,6 @@ public class NetworkMonitorTest {
when(mResources.getString(anyInt())).thenReturn("");
when(mResources.getStringArray(anyInt())).thenReturn(new String[0]);
- when(mNetworkInfo.getType()).thenReturn(ConnectivityManager.TYPE_WIFI);
setFallbackUrl(TEST_FALLBACK_URL);
setOtherFallbackUrls(TEST_OTHER_FALLBACK_URL);
setFallbackSpecs(null); // Test with no fallback spec by default