Merge remote branch 'goog/honeycomb-mr2'
Conflicts:
apps/CtsVerifier/AndroidManifest.xml
apps/CtsVerifier/res/values/strings.xml
apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureSummaryActivity.java
tests/core/runner/src/android/test/InstrumentationCtsTestRunner.java
tests/expectations/knownfailures-3.0_r1.txt
tests/expectations/knownfailures.txt
tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
tests/tests/os/src/android/os/cts/BuildVersionTest.java
tools/host/src/com/android/cts/Version.java
Change-Id: If9da4508f8eee25351538e3118e6ae990be49c60
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));
}
}