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/NetworkInfo_DetailedStateTest.java b/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
index 196e102..6b9b985 100644
--- a/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
+++ b/tests/cts/net/src/android/net/cts/NetworkInfo_DetailedStateTest.java
@@ -16,12 +16,13 @@
package android.net.cts;
-import android.net.NetworkInfo.DetailedState;
-import android.test.AndroidTestCase;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetClass;
import dalvik.annotation.TestTargetNew;
+import android.net.NetworkInfo.DetailedState;
+import android.test.AndroidTestCase;
+
@TestTargetClass(DetailedState.class)
public class NetworkInfo_DetailedStateTest extends AndroidTestCase {
@@ -52,7 +53,7 @@
)
public void testValues() {
DetailedState[] expected = DetailedState.values();
- assertEquals(10, expected.length);
+ assertEquals(11, expected.length);
assertEquals(DetailedState.IDLE, expected[0]);
assertEquals(DetailedState.SCANNING, expected[1]);
assertEquals(DetailedState.CONNECTING, expected[2]);
@@ -63,6 +64,7 @@
assertEquals(DetailedState.DISCONNECTING, expected[7]);
assertEquals(DetailedState.DISCONNECTED, expected[8]);
assertEquals(DetailedState.FAILED, expected[9]);
+ assertEquals(DetailedState.BLOCKED, expected[10]);
}
}