From adbcf224267a1df7362dad13b0862b50f57b3c68 Mon Sep 17 00:00:00 2001 From: Liangcai Li Date: Fri, 10 Jan 2014 16:01:46 +0800 Subject: [PATCH] Support WiFi only device at runtime. As what is done in ConnectivityService to fix bug: 8562845. Otherwise some related tests like 'testGetAllNetworkInfo' would fail with runtime detection on WiFi only device. Change-Id: I94922729c11826b3711abf42f594dcdd994324b6 Signed-off-by: Liangcai Li --- .../net/src/android/net/cts/ConnectivityManagerTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 5656119d0f..ab4bc7ec55 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -30,6 +30,7 @@ import android.net.NetworkInfo.State; import android.net.wifi.WifiManager; import android.test.AndroidTestCase; import android.util.Log; +import android.os.SystemProperties; import java.util.ArrayList; import java.util.HashMap; @@ -69,10 +70,14 @@ public class ConnectivityManagerTest extends AndroidTestCase { // Get com.android.internal.R.array.networkAttributes int resId = getContext().getResources().getIdentifier("networkAttributes", "array", "android"); 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) { try { NetworkConfig n = new NetworkConfig(naString); + if (wifiOnly && ConnectivityManager.isNetworkTypeMobile(n.type)) { + continue; + } mNetworks.put(n.type, n); } catch (Exception e) {} }