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

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

Browse Source 
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
parent 92a7123377 99ec4c0d91
commit 4ae5e1d2a1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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