Merge "Recheck if the network state in expedited job is unexpected." into sc-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 5352a60..5b88f1b 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
@@ -850,8 +850,10 @@
final String error = checkForAvailabilityInResultData(
resultData, expectAvailable);
if (error != null) {
- fail("Network is not available for expedited job in app2 (" + mUid + "): "
- + error);
+ Log.d(TAG, "Network state is unexpected, checking again. " + error);
+ // Right now we could end up in an unexpected state if expedited job
+ // doesn't have network access immediately after starting, so check again.
+ assertNetworkAccess(expectAvailable, false /* needScreenOn */);
}
} else {
fail("Unexpected resultCode=" + resultCode + "; received=[" + resultData + "]");