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

Merge "Support WiFi only device at runtime." into kitkat-cts-dev

Browse Source 
automerge: 545427f

* commit '545427fc9ecf0d1ed3e4d34697e11e09c5775b63':
  Support WiFi only device at runtime.
This commit is contained in:
Daniel Xie
2015-07-24 22:32:23 +00:00
committed by android-build-merger
parent ab0f0fe884 545427fc9e
commit f6915b6f02
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import android.net.NetworkInfo.State;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.util.Log; import android.util.Log;
import android.os.SystemProperties;
import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneConstants;
@@ -70,10 +71,14 @@ public class ConnectivityManagerTest extends AndroidTestCase {
// Get com.android.internal.R.array.networkAttributes // Get com.android.internal.R.array.networkAttributes
int resId = getContext().getResources().getIdentifier("networkAttributes", "array", "android"); int resId = getContext().getResources().getIdentifier("networkAttributes", "array", "android");
String[] naStrings = getContext().getResources().getStringArray(resId); String[] naStrings = getContext().getResources().getStringArray(resId);
//TODO: What is the "correct" way to determine if this is a wifi only device?
boolean wifiOnly = SystemProperties.getBoolean("ro.radio.noril", false);
for (String naString : naStrings) { for (String naString : naStrings) {
try { try {
NetworkConfig n = new NetworkConfig(naString); NetworkConfig n = new NetworkConfig(naString);
if (wifiOnly && ConnectivityManager.isNetworkTypeMobile(n.type)) {
continue;
}
mNetworks.put(n.type, n); mNetworks.put(n.type, n);
} catch (Exception e) {} } catch (Exception e) {}
} }