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

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

Limit schedule() calls for only persisted jobs. 

Calling schedule() for persisted jobs is more expensive than for
non-persisted jobs, so set quotas only for persisted schedule() calls.
Also reducing the limit to 250 based on more analysis.

Bug: 135764360
Bug: 144363383
Test: atest CtsJobSchedulerTestCases
Change-Id: I4405a8da6245b9c9b32aa917b85cb351578205f5
parent 1ea91ab3

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

+40 −34
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
    private final List<JobRestriction> mJobRestrictions;



    private final CountQuotaTracker mQuotaTracker;

    private static final String QUOTA_TRACKER_SCHEDULE_TAG = ".schedule()";

    private static final String QUOTA_TRACKER_SCHEDULE_PERSISTED_TAG = ".schedulePersisted()";

    private final PlatformCompat mPlatformCompat;



    /**
@@ -522,7 +522,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
        private static final float DEFAULT_CONN_CONGESTION_DELAY_FRAC = 0.5f;

        private static final float DEFAULT_CONN_PREFETCH_RELAX_FRAC = 0.5f;

        private static final boolean DEFAULT_ENABLE_API_QUOTAS = true;

        private static final int DEFAULT_API_QUOTA_SCHEDULE_COUNT = 500;

        private static final int DEFAULT_API_QUOTA_SCHEDULE_COUNT = 250;

        private static final long DEFAULT_API_QUOTA_SCHEDULE_WINDOW_MS = MINUTE_IN_MILLIS;

        private static final boolean DEFAULT_API_QUOTA_SCHEDULE_THROW_EXCEPTION = true;
@@ -740,6 +740,8 @@ public class JobSchedulerService extends com.android.server.SystemService 


            ENABLE_API_QUOTAS = mParser.getBoolean(KEY_ENABLE_API_QUOTAS,

                DEFAULT_ENABLE_API_QUOTAS);

            // Set a minimum value on the quota limit so it's not so low that it interferes with

            // legitimate use cases.

            API_QUOTA_SCHEDULE_COUNT = Math.max(250,

                    mParser.getInt(KEY_API_QUOTA_SCHEDULE_COUNT, DEFAULT_API_QUOTA_SCHEDULE_COUNT));

            API_QUOTA_SCHEDULE_WINDOW_MS = mParser.getDurationMillis(
@@ -1054,8 +1056,11 @@ public class JobSchedulerService extends com.android.server.SystemService 


    public int scheduleAsPackage(JobInfo job, JobWorkItem work, int uId, String packageName,

            int userId, String tag) {

        final String pkg = packageName == null ? job.getService().getPackageName() : packageName;

        if (!mQuotaTracker.isWithinQuota(userId, pkg, QUOTA_TRACKER_SCHEDULE_TAG)) {

        if (job.isPersisted()) {

            // Only limit schedule calls for persisted jobs.

            final String pkg =

                    packageName == null ? job.getService().getPackageName() : packageName;

            if (!mQuotaTracker.isWithinQuota(userId, pkg, QUOTA_TRACKER_SCHEDULE_PERSISTED_TAG)) {

                Slog.e(TAG, userId + "-" + pkg + " has called schedule() too many times");

                // TODO(b/145551233): attempt to restrict app

                if (mConstants.API_QUOTA_SCHEDULE_THROW_EXCEPTION
@@ -1091,7 +1096,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                }

                return JobScheduler.RESULT_FAILURE;

            }

        mQuotaTracker.noteEvent(userId, pkg, QUOTA_TRACKER_SCHEDULE_TAG);

            mQuotaTracker.noteEvent(userId, pkg, QUOTA_TRACKER_SCHEDULE_PERSISTED_TAG);

        }



        try {

            if (ActivityManager.getService().isAppStartModeDisabled(uId,