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

am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6

Browse Source 
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
  Support WiFi only device at runtime.
This commit is contained in:
Daniel Xie
2015-08-05 18:28:01 +00:00
committed by Android Git Automerger
parent 92ec8f7720 ea9003d969
commit 9417d7288d
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) {}
} }