resolved conflicts for merge of b5d1b8d9 to master
Change-Id: I27437b34ee8792334b18f3d888092b28b16c0b33
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]);
}
}