LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Ensure that Ethernet is supported if the service is running."

Browse Source 
am: 266fad4970

Change-Id: I9faf940c6d36abb1b0e7b07cbb01974cdf1e9d25
This commit is contained in:
Lorenzo Colitti
2017-09-27 08:31:15 +00:00
committed by android-build-merger
parent 8a707e0272 266fad4970
commit ace309a7ad
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -37,6 +37,7 @@ import android.net.NetworkInfo.DetailedState;
import android.net.NetworkInfo.State; import android.net.NetworkInfo.State;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Looper;
import android.os.SystemProperties; import android.os.SystemProperties;
import android.system.Os; import android.system.Os;
import android.system.OsConstants; import android.system.OsConstants;
@@ -110,6 +111,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {
super.setUp(); super.setUp();
Looper.prepare();
mContext = getContext(); mContext = getContext();
mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE); mCm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE); mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
@@ -279,11 +281,10 @@ public class ConnectivityManagerTest extends AndroidTestCase {
} }
private boolean isSupported(int networkType) { 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) || 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() { public void testIsNetworkSupported() {