commit 740064e97f0e653427a7eb5f99052d9e5a8e27f3
author JP Abgrall <jpa@google.com> Tue Sep 22 03:45:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 03:45:28 2015 +0000
tree 7ed1e5c4cbce62e5bca4103e4b76c8fbac5d2e67
parent b640b49e4451dacb5ce181df86b7c662ee50e693
parent ab0f0fe884c280adcde0259f4692cebfb3d0bf08

am ab0f0fe8: Merge "Fix CTS build" into lollipop-cts-dev

* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build

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 d79ecdd..d12c1ce 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -29,6 +29,7 @@
 import android.net.wifi.WifiManager;
 import android.test.AndroidTestCase;
 import android.util.Log;
+import android.os.SystemProperties;
 
 import com.android.internal.telephony.PhoneConstants;
 
@@ -70,10 +71,14 @@
         // 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) {}
         }