commit c40627af2b156455da7912cb82a46049eb3aa47b
author Lorenzo Colitti <lorenzo@google.com> Wed Sep 27 09:05:14 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 27 09:05:14 2017 +0000
tree 6d3495bd342c20257c4387eca599c24510276744
parent 783f59fe255065f2b663223e686114435e675675
parent 6506340c5c3901467f1e25c81bf7f654f93001aa

Merge "Ensure that Ethernet is supported if the service is running." am: 266fad4970 am: ace309a7ad am: 24aa40363f
am: 6506340c5c

Change-Id: If8183d6a77c76af1eeed39a46cc801676aae6475

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index 1396a1c..27dd666 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -41,6 +41,7 @@
 import android.net.NetworkInfo.State;
 import android.net.NetworkRequest;
 import android.net.wifi.WifiManager;
+import android.os.Looper;
 import android.os.SystemProperties;
 import android.system.Os;
 import android.system.OsConstants;
@@ -125,6 +126,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        Looper.prepare();
         mContext = getContext();
         mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
         mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -387,11 +389,10 @@
     }
 
     private boolean isSupported(int networkType) {
-        // Change-Id I02eb5f22737720095f646f8db5c87fd66da129d6 added VPN support
-        // to all devices directly in software, independent of any external
-        // configuration.
         return mNetworks.containsKey(networkType) ||
-               (networkType == ConnectivityManager.TYPE_VPN);
+               (networkType == ConnectivityManager.TYPE_VPN) ||
+               (networkType == ConnectivityManager.TYPE_ETHERNET &&
+                       mContext.getSystemService(Context.ETHERNET_SERVICE) != null);
     }
 
     public void testIsNetworkSupported() {