commit 0bcdf4ac97077547e9c2466574d891da8b7c8fc5
author Brian Muramatsu <btmura@google.com> Fri Oct 07 11:55:14 2011 -0700
committer Brian Muramatsu <btmura@google.com> Fri Oct 07 11:55:14 2011 -0700
tree b8b89ae15f9753bd7e97d8413256da6fc5f444e5
parent 68f66bffff2299aab6103b8fb01854988430c147
parent 93ca5b572b2bd52d9dcb8a26cb14c07ae0a12ffc

Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2

Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tools/host/src/com/android/cts/Version.java

Change-Id: I5e9642c74dd3381865e731567e7decebb9ab2b71

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 3751b3c..2db0acb 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -35,6 +35,8 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -170,12 +172,20 @@
         args = {int.class, int.class}
     )
     public void testRequestRouteToHost() {
+        Set<Integer> exceptionFreeTypes = new HashSet<Integer>();
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_BLUETOOTH);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_ETHERNET);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_DUN);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_HIPRI);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_MMS);
+        exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_SUPL);
 
         NetworkInfo[] ni = mCm.getAllNetworkInfo();
         for (NetworkInfo n : ni) {
-            // make sure network is up (except WIFI due to always fail)
-            if (n.isConnected() && (n.getType() != TYPE_WIFI)) {
-                assertTrue(mCm.requestRouteToHost(n.getType(), HOST_ADDRESS));
+            if (n.isConnected() && exceptionFreeTypes.contains(n.getType())) {
+                assertTrue("Network type: " + n.getType(), mCm.requestRouteToHost(n.getType(),
+                        HOST_ADDRESS));
             }
         }