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

Commit 16e21100 authored by Kweku Adams's avatar Kweku Adams Committed by Android (Google) Code Review
Browse files

Merge "Exclude user-initiated jobs from flex constraints."

parents 74743362 e0f68512

apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ public final class JobStatus { 


        // The first time a job is rescheduled it will not be subject to flexible constraints.

        // Otherwise, every consecutive reschedule increases a jobs' flexibility deadline.

        if (!isRequestedExpeditedJob()

        if (!isRequestedExpeditedJob() && !job.isUserInitiated()

                && satisfiesMinWindowException

                && (numFailures + numSystemStops) != 1

                && lacksSomeFlexibleConstraints) {

services/tests/mockingservicestests/src/com/android/server/job/controllers/FlexibilityControllerTest.java

+8 −0
Original line number Diff line number Diff line
@@ -616,6 +616,14 @@ public class FlexibilityControllerTest { 
        assertFalse(js.hasFlexibilityConstraint());

    }



    @Test

    public void testExceptions_UserInitiated() {

        JobInfo.Builder jb = createJob(0);

        jb.setUserInitiated(true);

        JobStatus js = createJobStatus("testExceptions_UserInitiated", jb);

        assertFalse(js.hasFlexibilityConstraint());

    }



    @Test

    public void testExceptions_ShortWindow() {

        JobInfo.Builder jb = createJob(0);