diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-01 23:44:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-01 23:44:39 +0000 |
| commit | 9dc27d197711577bc8b96257800aed157c6652dd (patch) | |
| tree | 20a91b845252805137d3f3f84b9393b36c4ff5f3 | |
| parent | 53d8d848ab888440bbf0b34ad6e094c85919d0c8 (diff) | |
| parent | 6b8c19ba12ff9ae76bc666fe1208eb7b0e648146 (diff) | |
| download | cts-9dc27d197711577bc8b96257800aed157c6652dd.tar.gz | |
Merge "RESTRICT AUTOMERGE: Ensure resetFakeUnpluggedState must be called" into pie-cts-dev
| -rw-r--r-- | tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java index a3e934379a8..c6694d4bc0d 100644 --- a/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java +++ b/tests/JobScheduler/src/android/jobscheduler/cts/DeviceIdleJobsTest.java @@ -192,23 +192,29 @@ public class DeviceIdleJobsTest { assumeTrue("app standby not enabled", mAppStandbyEnabled); enterFakeUnpluggedState(); - setTestPackageStandbyBucket(Bucket.NEVER); - Thread.sleep(DEFAULT_WAIT_TIMEOUT); - sendScheduleJobBroadcast(false); - assertFalse("New job started in NEVER standby", awaitJobStart(3_000)); - resetFakeUnpluggedState(); + try { + setTestPackageStandbyBucket(Bucket.NEVER); + Thread.sleep(DEFAULT_WAIT_TIMEOUT); + sendScheduleJobBroadcast(false); + assertFalse("New job started in NEVER standby", awaitJobStart(3_000)); + } finally { + resetFakeUnpluggedState(); + } } @Test public void testUidActiveBypassesStandby() throws Exception { enterFakeUnpluggedState(); - setTestPackageStandbyBucket(Bucket.NEVER); - tempWhitelistTestApp(6_000); - Thread.sleep(DEFAULT_WAIT_TIMEOUT); - sendScheduleJobBroadcast(false); - assertTrue("New job in uid-active app failed to start in NEVER standby", - awaitJobStart(4_000)); - resetFakeUnpluggedState(); + try { + setTestPackageStandbyBucket(Bucket.NEVER); + tempWhitelistTestApp(6_000); + Thread.sleep(DEFAULT_WAIT_TIMEOUT); + sendScheduleJobBroadcast(false); + assertTrue("New job in uid-active app failed to start in NEVER standby", + awaitJobStart(4_000)); + } finally { + resetFakeUnpluggedState(); + } } @After |