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

Commit 46976be2 authored by Xin Guan's avatar Xin Guan
Browse files

JobScheduler: Remove FLAG_ENFORCE_QUOTA_POLICY_TO_TOP_STARTED_JOBS 

Bug: 423980150
Test: atest FrameworksMockingServicesTests:com.android.server.job.controllers.QuotaControllerTest
Flag: EXEMPT flag cleanup
Change-Id: I790cc3b9ee1f3d09da6b100ffb244bd1f52c011a
parent 3fc01416

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

+6 −12
Original line number Diff line number Diff line
@@ -669,10 +669,8 @@ public final class QuotaController extends StateController { 
        }



        final int uid = jobStatus.getSourceUid();

        if ((!Flags.enforceQuotaPolicyToTopStartedJobs()

                || mPlatformCompat.isChangeEnabledByUid(

                        OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS, uid))

                && mTopAppCache.get(uid)) {

        if ((mPlatformCompat.isChangeEnabledByUid(

                OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS, uid)) && mTopAppCache.get(uid)) {

            if (DEBUG) {

                Slog.d(TAG, jobStatus.toShortString() + " is top started job");

            }
@@ -709,8 +707,7 @@ public final class QuotaController extends StateController { 
                timer.stopTrackingJob(jobStatus);

            }

        }

        if (!Flags.enforceQuotaPolicyToTopStartedJobs()

                || mPlatformCompat.isChangeEnabledByUid(

        if (mPlatformCompat.isChangeEnabledByUid(

                OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS, jobStatus.getSourceUid())) {

            mTopStartedJobs.remove(jobStatus);

        }
@@ -824,8 +821,7 @@ public final class QuotaController extends StateController { 


    /** @return true if the job was started while the app was in the TOP state. */

    private boolean isTopStartedJobLocked(@NonNull final JobStatus jobStatus) {

        if (!Flags.enforceQuotaPolicyToTopStartedJobs()

                || mPlatformCompat.isChangeEnabledByUid(

        if (mPlatformCompat.isChangeEnabledByUid(

                OVERRIDE_QUOTA_ENFORCEMENT_TO_TOP_STARTED_JOBS, jobStatus.getSourceUid())) {

            return mTopStartedJobs.contains(jobStatus);

        }
@@ -4595,8 +4591,6 @@ public final class QuotaController extends StateController { 
                + ": " + Flags.adjustQuotaDefaultConstants());

        pw.println("    " + Flags.FLAG_ENFORCE_QUOTA_POLICY_TO_FGS_JOBS

                + ": " + Flags.enforceQuotaPolicyToFgsJobs());

        pw.println("    " + Flags.FLAG_ENFORCE_QUOTA_POLICY_TO_TOP_STARTED_JOBS

                + ": " + Flags.enforceQuotaPolicyToTopStartedJobs());

        pw.println("    " + Flags.FLAG_ADDITIONAL_QUOTA_FOR_SYSTEM_INSTALLER

                + ": " + Flags.additionalQuotaForSystemInstaller());

        pw.println();

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

+3 −515

File changed.

Preview size limit exceeded, changes collapsed.