Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3a2227b authored by Kweku Adams's avatar Kweku Adams
Browse files

Limit min runtime for downgraded EJs. 

All jobs with HIGH or MAX priority should have reduced execution
timeouts, including downgraded expedited jobs.

Bug: 142272435
Test: atest FrameworksMockingServicesTests:JobSchedulerServiceTest
Change-Id: I131206fbfa0b58bedbe912b02e44a90ef1e49596
parent d30c9c99

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2768,7 +2768,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
                return job.getEffectiveStandbyBucket() != RESTRICTED_INDEX

                        ? mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS

                        : Math.min(mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS, 5 * MINUTE_IN_MILLIS);

            } else if (job.getEffectivePriority() == JobInfo.PRIORITY_HIGH) {

            } else if (job.getEffectivePriority() >= JobInfo.PRIORITY_HIGH) {

                return mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS;

            } else {

                return mConstants.RUNTIME_MIN_GUARANTEE_MS;

services/tests/mockingservicestests/src/com/android/server/job/JobSchedulerServiceTest.java

+43 −0
Original line number Diff line number Diff line
@@ -204,6 +204,49 @@ public class JobSchedulerServiceTest { 
                jobInfoBuilder.build(), callingUid, "com.android.test", 0, testTag);

    }



    @Test

    public void testGetMinJobExecutionGuaranteeMs() {

        JobStatus ejMax = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(1).setExpedited(true));

        JobStatus ejHigh = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(2).setExpedited(true).setPriority(JobInfo.PRIORITY_HIGH));

        JobStatus ejMaxDowngraded = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(3).setExpedited(true));

        JobStatus ejHighDowngraded = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(4).setExpedited(true).setPriority(JobInfo.PRIORITY_HIGH));

        JobStatus jobHigh = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(5).setPriority(JobInfo.PRIORITY_HIGH));

        JobStatus jobDef = createJobStatus("testGetMinJobExecutionGuaranteeMs",

                createJobInfo(6));



        spyOn(ejMax);

        spyOn(ejHigh);

        spyOn(ejMaxDowngraded);

        spyOn(ejHighDowngraded);

        spyOn(jobHigh);

        spyOn(jobDef);



        when(ejMax.shouldTreatAsExpeditedJob()).thenReturn(true);

        when(ejHigh.shouldTreatAsExpeditedJob()).thenReturn(true);

        when(ejMaxDowngraded.shouldTreatAsExpeditedJob()).thenReturn(false);

        when(ejHighDowngraded.shouldTreatAsExpeditedJob()).thenReturn(false);

        when(jobHigh.shouldTreatAsExpeditedJob()).thenReturn(false);

        when(jobDef.shouldTreatAsExpeditedJob()).thenReturn(false);



        assertEquals(mService.mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(ejMax));

        assertEquals(mService.mConstants.RUNTIME_MIN_EJ_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(ejHigh));

        assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(ejMaxDowngraded));

        assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(ejHighDowngraded));

        assertEquals(mService.mConstants.RUNTIME_MIN_HIGH_PRIORITY_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(jobHigh));

        assertEquals(mService.mConstants.RUNTIME_MIN_GUARANTEE_MS,

                mService.getMinJobExecutionGuaranteeMs(jobDef));

    }



    /**

     * Confirm that {@link JobSchedulerService#getRescheduleJobForPeriodic(JobStatus)} returns a job

     * with the correct delay and deadline constraints if the periodic job is scheduled with the