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

Merge remote branch 'goog/honeycomb-mr2'

Browse Source 
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
This commit is contained in:
Brian Muramatsu
2011-08-30 16:06:33 -07:00
parent 2f9310c000 68f66bffff
commit a3b6f08cf8
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -35,6 +35,8 @@ import android.net.wifi.WifiManager;
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 @@ public class ConnectivityManagerTest extends AndroidTestCase {
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));
}
}