From ce96fa05a77fdce4deac52a2b1a00aea9ea0b23e Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Fri, 2 Jul 2021 12:43:17 -0700 Subject: [PATCH] Recheck if the network state in expedited job is unexpected. Unfortunately, this could happen if there is a delay in updating the network rules for the app hosting the job. Bug: 179319857 Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Change-Id: I60cfd5c5946a4cd0ef5ebf0c1e56b0667cc3164d Ignore-AOSP-First: Expedited jobs are not available in AOSP yet --- .../hostside/AbstractRestrictBackgroundNetworkTestCase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 5352a604b3..5b88f1bb7d 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 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { 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 + "]");