Merge "Revert "Relax the check of network availability in CtsHostsideNetworkTests."" into oc-dev

am: 6ec7be5f3c

Change-Id: I1fbbb4f651cc227a59d3d19f871ed3b6679e03b0
This commit is contained in:
Sudheer Shanka
2017-04-21 02:06:21 +00:00
committed by android-build-merger

View File

@@ -833,9 +833,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
}
if (latch.await(FOREGROUND_PROC_NETWORK_TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
if (!errors[0].isEmpty()) {
// TODO: revert this change once b/35523062 is fixed.
// fail("Network is not available for app2 (" + mUid + "): " + errors[0]);
assertForegroundNetworkAccess();
fail("Network is not available for app2 (" + mUid + "): " + errors[0]);
}
} else {
fail("Timed out waiting for network availability status from app2 (" + mUid + ")");