diff options
author | 2025-01-27 16:20:40 -0800 | |
---|---|---|
committer | 2025-02-12 12:18:29 -0800 | |
commit | 1896f641589750945af6bac4c0730aab755fe57c (patch) | |
tree | 3a02f074f0c9b24aa68e60ce411e8f69a62991fc | |
parent | ce7c89a39a1303d9a9ee272d0c3f459190d782a3 (diff) |
Fix a CTS test issue that job is not scheduled
The test framework should not fail job schedule assertion
when the job's state is "pending", "ready", or "active".
Bug: 359412139
Test: atest LocationAccessCheckTest
Flag: EXEMPT test fix
Relnote: test fix
LOW_COVERAGE_REASON=TEST_ONLY
Change-Id: I7bb4afe4740a3e10dc17a175025157adba415a54
-rw-r--r-- | tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java index aabdd8565..55c2d9f31 100644 --- a/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java +++ b/tests/cts/permission/permissionTestUtilLib/src/android/permission/cts/PermissionUtils.java @@ -384,7 +384,7 @@ public class PermissionUtils { simulateReboot(packageName, intentAction, broadcastReceiver); while ((System.currentTimeMillis() - startTime) < timeout - && !jobStatus.contains("waiting")) { + && !isJobScheduled(jobStatus)) { String cmd = "cmd jobscheduler get-job-state -u " + Process.myUserHandle().getIdentifier() + " " + packageName + " " + jobId; @@ -396,11 +396,16 @@ public class PermissionUtils { // ignore interrupt } } - if (!jobStatus.contains("waiting")) { + if (!isJobScheduled(jobStatus)) { throw new IllegalStateException("The job didn't get scheduled in time."); } } + private static boolean isJobScheduled(String jobStatus) throws Exception { + return jobStatus.contains("waiting") || jobStatus.contains("pending") + || jobStatus.contains("ready") || jobStatus.contains("active"); + } + private static void simulateReboot(@NonNull String packageName, @NonNull String intentAction, @NonNull String broadcastReceiver) { Intent jobSetupReceiverIntent = new Intent(intentAction); |