commit 5e823ab263f779b566960a66c2eb9e4d511c598f
author Remi NGUYEN VAN <reminv@google.com> Fri Jan 25 05:55:08 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 25 05:55:08 2019 +0000
tree be51f8be797c4ca2410392ae63acbb506db20eeb
parent 33a09948e5a413eb2f78976e742566d3efa152d2
parent 89485143f13448d1a75df7bff2b47e91396b3d36

Merge "Fix IpClientTest"

packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java

diff --git a/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java b/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java
index f21809f..4ae044de 100644
--- a/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java
+++ b/packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java
@@ -103,9 +103,7 @@
         MockitoAnnotations.initMocks(this);
 
         when(mContext.getSystemService(eq(Context.ALARM_SERVICE))).thenReturn(mAlarm);
-        when(mContext.getSystemServiceName(ConnectivityManager.class))
-                .thenReturn(Context.CONNECTIVITY_SERVICE);
-        when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
+        when(mContext.getSystemService(eq(ConnectivityManager.class))).thenReturn(mCm);
         when(mContext.getResources()).thenReturn(mResources);
         when(mResources.getInteger(R.integer.config_networkAvoidBadWifi))
                 .thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE);