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

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

Lower fallback deadline. 

Lower the fallback deadline to a more reasonable 24 hours.

Bug: 236261941
Bug: 299329948
Bug: 299346198
Test: atest FrameworksMockingServicesTests:FlexibilityControllerTest
Change-Id: I0c60e9d3152e84c1c7975aca684099efd0750c8d
parent 28b155ba

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

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ public final class FlexibilityController extends StateController { 
        @VisibleForTesting

        static final long DEFAULT_DEADLINE_PROXIMITY_LIMIT_MS = 15 * MINUTE_IN_MILLIS;

        @VisibleForTesting

        static final long DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_MS = 72 * HOUR_IN_MILLIS;

        static final long DEFAULT_FALLBACK_FLEXIBILITY_DEADLINE_MS = 24 * HOUR_IN_MILLIS;

        private static final long DEFAULT_MIN_TIME_BETWEEN_FLEXIBILITY_ALARMS_MS = MINUTE_IN_MILLIS;

        @VisibleForTesting

        final int[] DEFAULT_PERCENT_TO_DROP_FLEXIBLE_CONSTRAINTS = {50, 60, 70, 80};

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

+12 −7
Original line number Diff line number Diff line
@@ -426,6 +426,8 @@ public class FlexibilityControllerTest { 


    @Test

    public void testGetNextConstraintDropTimeElapsedLocked() {

        setDeviceConfigLong(KEY_FALLBACK_FLEXIBILITY_DEADLINE, 200 * HOUR_IN_MILLIS);



        long nextTimeToDropNumConstraints;



        // no delay, deadline
@@ -457,15 +459,18 @@ public class FlexibilityControllerTest { 


        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(130400100, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + 800000L + (200 * HOUR_IN_MILLIS) / 2,

                nextTimeToDropNumConstraints);

        js.setNumDroppedFlexibleConstraints(1);

        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(156320100L, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + 800000L + (200 * HOUR_IN_MILLIS) * 6 / 10,

                nextTimeToDropNumConstraints);

        js.setNumDroppedFlexibleConstraints(2);

        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(182240100L, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + 800000L + (200 * HOUR_IN_MILLIS) * 7 / 10,

                nextTimeToDropNumConstraints);



        // no delay, no deadline

        jb = createJob(0);
@@ -473,15 +478,15 @@ public class FlexibilityControllerTest { 


        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(129600100, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + (200 * HOUR_IN_MILLIS) / 2, nextTimeToDropNumConstraints);

        js.setNumDroppedFlexibleConstraints(1);

        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(155520100L, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + (200 * HOUR_IN_MILLIS) * 6 / 10, nextTimeToDropNumConstraints);

        js.setNumDroppedFlexibleConstraints(2);

        nextTimeToDropNumConstraints = mFlexibilityController

                .getNextConstraintDropTimeElapsedLocked(js);

        assertEquals(181440100L, nextTimeToDropNumConstraints);

        assertEquals(FROZEN_TIME + (200 * HOUR_IN_MILLIS) * 7 / 10, nextTimeToDropNumConstraints);



        // delay, deadline

        jb = createJob(0)
@@ -1328,7 +1333,7 @@ public class FlexibilityControllerTest { 


        final ArraySet<String> pkgs = new ArraySet<>();

        pkgs.add(js.getSourcePackageName());

        when(mJobSchedulerService.getPackagesForUidLocked(mSourceUid)).thenReturn(pkgs);

        doReturn(pkgs).when(mJobSchedulerService).getPackagesForUidLocked(mSourceUid);



        setUidBias(mSourceUid, BIAS_TOP_APP);

        setUidBias(mSourceUid, BIAS_FOREGROUND_SERVICE);