commit | 6ae63d613c44f5c85c0850a349f1172ef3a12b12 | [log] [tgz] |
---|---|---|
author | Etan Cohen <etancohen@google.com> | Tue Apr 25 03:26:01 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 25 03:26:04 2017 +0000 |
tree | f66be81c70ef680a41e47b608b98f1e6c64322fb | |
parent | 99ec4c0d91baddd70364da7e65091dc7a6494fd9 [diff] | |
parent | 2fa28c39ae81e1f0a52b9ed1dc42289937f20bca [diff] |
Merge "[AWARE] Rename destroy() method to close()" into oc-dev
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 b6857ae..577f62c 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
@@ -833,9 +833,7 @@ } 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 + ")");