joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove the redundant sleep after turning on the screen.

Browse source 
We are checking for network access in onResume(), which
wouldn't be called until the screen is on. So, there
shouldn't be a need for the extra sleep after turning
on the screen.

Also, remove redundant waits after the last try when
doing verifications as the test is anyway to going to
fail at this point.

Bug: 231440256
Test: atest tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
Change-Id: I28429c929142a95c19b1f8a5b7d28b9c8c4a45b9
Merged-In: I28429c929142a95c19b1f8a5b7d28b9c8c4a45b9
This commit is contained in:
Sudheer Shanka 2022-05-20 17:38:34 -07:00
commit c2edb9cbc4
1 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

40
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View file

@ -217,7 +217,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
Log.d(TAG, "Expecting count " + expectedCount + " but actual is " + count + " after "
+ attempts + " attempts; sleeping "
+ SLEEP_TIME_SEC + " seconds before trying again");
SystemClock.sleep(SLEEP_TIME_SEC * SECOND_IN_MS);
// No sleep after the last turn
if (attempts <= maxAttempts) {
SystemClock.sleep(SLEEP_TIME_SEC * SECOND_IN_MS);
}
} while (attempts <= maxAttempts);
assertEquals("Number of expected broadcasts for " + receiverName + " not reached after "
+ maxAttempts * SLEEP_TIME_SEC + " seconds", expectedCount, count);
@ -328,7 +331,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
}
Log.d(TAG, "App not on background state (" + state + ") on attempt #" + i
+ "; sleeping 1s before trying again");
SystemClock.sleep(SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(SECOND_IN_MS);
}
}
fail("App2 (" + mUid + ") is not on background state after "
+ maxTries + " attempts: " + state);
@ -347,7 +353,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
Log.d(TAG, "App not on foreground state on attempt #" + i
+ "; sleeping 1s before trying again");
turnScreenOn();
SystemClock.sleep(SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(SECOND_IN_MS);
}
}
fail("App2 (" + mUid + ") is not on foreground state after "
+ maxTries + " attempts: " + state);
@ -365,7 +374,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
}
Log.d(TAG, "App not on foreground service state on attempt #" + i
+ "; sleeping 1s before trying again");
SystemClock.sleep(SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(SECOND_IN_MS);
}
}
fail("App2 (" + mUid + ") is not on foreground service state after "
+ maxTries + " attempts: " + state);
@ -506,7 +518,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
Log.v(TAG, "Command '" + command + "' returned '" + result + " instead of '"
+ checker.getExpected() + "' on attempt #" + i
+ "; sleeping " + napTimeSeconds + "s before trying again");
SystemClock.sleep(napTimeSeconds * SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(napTimeSeconds * SECOND_IN_MS);
}
}
fail("Command '" + command + "' did not return '" + checker.getExpected() + "' after "
+ maxTries
@ -578,7 +593,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
}
Log.v(TAG, list + " check for uid " + uid + " doesn't match yet (expected "
+ expected + ", got " + actual + "); sleeping 1s before polling again");
SystemClock.sleep(SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(SECOND_IN_MS);
}
}
fail(list + " check for uid " + uid + " failed: expected " + expected + ", got " + actual
+ ". Full list: " + uids);
@ -738,7 +756,8 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
protected void assertAppIdle(boolean enabled) throws Exception {
try {
assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG, 15, 2, "Idle=" + enabled);
assertDelayedShellCommand("am get-inactive " + TEST_APP2_PKG,
30 /* maxTries */, 1 /* napTimeSeconds */, "Idle=" + enabled);
} catch (Throwable e) {
throw e;
}
@ -765,7 +784,10 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
return;
}
Log.v(TAG, "app2 receiver is not ready yet; sleeping 1s before polling again");
SystemClock.sleep(SECOND_IN_MS);
// No sleep after the last turn
if (i < maxTries) {
SystemClock.sleep(SECOND_IN_MS);
}
}
fail("app2 receiver is not ready in " + mUid);
}
@ -814,8 +836,6 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase {
return;
} else if (type == TYPE_COMPONENT_ACTIVTIY) {
turnScreenOn();
// Wait for screen-on state to propagate through the system.
SystemClock.sleep(2000);
final CountDownLatch latch = new CountDownLatch(1);
final Intent launchIntent = getIntentForComponent(type);
final Bundle extras = new Bundle();