Merge "Recheck if the network state in expedited job is unexpected." into sc-dev am: 1ec983c471

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15191249

Change-Id: I02fb4442949afbe1b6ba4330f4986f7369f97851
This commit is contained in:
Sudheer Shanka
2021-07-07 18:35:55 +00:00
committed by Automerger Merge Worker

View File

@@ -850,8 +850,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
final String error = checkForAvailabilityInResultData( final String error = checkForAvailabilityInResultData(
resultData, expectAvailable); resultData, expectAvailable);
if (error != null) { if (error != null) {
fail("Network is not available for expedited job in app2 (" + mUid + "): " Log.d(TAG, "Network state is unexpected, checking again. " + error);
+ 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 { } else {
fail("Unexpected resultCode=" + resultCode + "; received=[" + resultData + "]"); fail("Unexpected resultCode=" + resultCode + "; received=[" + resultData + "]");