commit 691e85def733e6c8c3066c25448e51edad47f1dd
author Felipe Leme <felipeal@google.com> Wed May 04 11:46:08 2016 -0700
committer Felipe Leme <felipeal@google.com> Wed May 04 18:48:24 2016 +0000
tree 66ab37c93d5e599eefb903626d6b1b793ab35fed
parent 50bce69fabb711b48ec7e4502cfa9115a31fc1e0

Temporarily disable NetworkInfo check.

There are known issues that cause these check to fail, and the fix has
not been submitted yet.

BUG: 28473659
BUG: 28521946
Change-Id: I26dfbebc2d07396ef89ac78230645e4791c708ee

tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java

diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index 08df9e1..08c8fdb 100644
--- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -71,6 +71,8 @@
     // Must be higher than NETWORK_TIMEOUT_MS
     private static final int ORDERED_BROADCAST_TIMEOUT_MS = NETWORK_TIMEOUT_MS * 4;
 
+    private static final boolean ASSERT_NETWORK_INFO_STATE = false;
+
     protected Context mContext;
     protected Instrumentation mInstrumentation;
     protected ConnectivityManager mCm;
@@ -220,15 +222,19 @@
         if (expectAvailable) {
             assertTrue("should be connected: " + connectionCheckDetails
                     + " (network info: " + networkInfo + ")", connected);
-            assertEquals("wrong state for " + networkInfo, State.CONNECTED, state);
-            assertEquals("wrong detailed state for " + networkInfo,
-                    DetailedState.CONNECTED, detailedState);
+            if (ASSERT_NETWORK_INFO_STATE) {
+                assertEquals("wrong state for " + networkInfo, State.CONNECTED, state);
+                assertEquals("wrong detailed state for " + networkInfo,
+                        DetailedState.CONNECTED, detailedState);
+            }
         } else {
             assertFalse("should not be connected: " + connectionCheckDetails
                     + " (network info: " + networkInfo + ")", connected);
-            assertEquals("wrong state for " + networkInfo, State.DISCONNECTED, state);
-            assertEquals("wrong detailed state for " + networkInfo,
-                    DetailedState.BLOCKED, detailedState);
+            if (ASSERT_NETWORK_INFO_STATE) {
+                assertEquals("wrong state for " + networkInfo, State.DISCONNECTED, state);
+                assertEquals("wrong detailed state for " + networkInfo,
+                        DetailedState.BLOCKED, detailedState);
+            }
         }
     }