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

Commit 5aa79340 authored by Xin Guan's avatar Xin Guan Committed by Android (Google) Code Review
Browse files

Merge "JobScheduler: Remove FLAG_ENFORCE_QUOTA_POLICY_TO_FGS_JOBS" into main

parents 2968777a 7db65657

apex/jobscheduler/service/aconfig/job.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -46,13 +46,6 @@ flag { 
   bug: "337077643"

}



flag {

   name: "enforce_quota_policy_to_fgs_jobs"

   namespace: "backstage_power"

   description: "Applies the normal quota policy to FGS jobs"

   bug: "341201311"

}



flag {

   name: "adjust_quota_default_constants"

   namespace: "backstage_power"

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

+4 −10
Original line number Diff line number Diff line
@@ -610,11 +610,9 @@ public final class QuotaController extends StateController { 
            ActivityManager.getService().registerUidObserver(new QcUidObserver(),

                    ActivityManager.UID_OBSERVER_PROCSTATE,

                    ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE, null);

            if (Flags.enforceQuotaPolicyToFgsJobs()) {

            ActivityManager.getService().registerUidObserver(new QcUidObserver(),

                    ActivityManager.UID_OBSERVER_PROCSTATE,

                    ActivityManager.PROCESS_STATE_BOUND_TOP, null);

            }

            ActivityManager.getService().registerUidObserver(new QcUidObserver(),

                    ActivityManager.UID_OBSERVER_PROCSTATE,

                    ActivityManager.PROCESS_STATE_TOP, null);
@@ -2709,9 +2707,7 @@ public final class QuotaController extends StateController { 


    @VisibleForTesting

    int getProcessStateQuotaFreeThreshold(int uid) {

        if (Flags.enforceQuotaPolicyToFgsJobs()

                && !mPlatformCompat.isChangeEnabledByUid(

                        OVERRIDE_QUOTA_ENFORCEMENT_TO_FGS_JOBS, uid)) {

        if (!mPlatformCompat.isChangeEnabledByUid(OVERRIDE_QUOTA_ENFORCEMENT_TO_FGS_JOBS, uid)) {

            return ActivityManager.PROCESS_STATE_BOUND_TOP;

        }
@@ -4589,8 +4585,6 @@ public final class QuotaController extends StateController { 
        pw.println("Aconfig Flags:");

        pw.println("    " + Flags.FLAG_ADJUST_QUOTA_DEFAULT_CONSTANTS

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

        pw.println("    " + Flags.FLAG_ENFORCE_QUOTA_POLICY_TO_FGS_JOBS

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

        pw.println("    " + Flags.FLAG_ADDITIONAL_QUOTA_FOR_SYSTEM_INSTALLER

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

        pw.println();

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

+0 −3
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import android.os.ServiceManager; 
import android.os.SystemClock;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.flag.junit.SetFlagsRule;
@@ -4840,7 +4839,6 @@ public class QuotaControllerTest { 


    /** Tests that Timers count FOREGROUND_SERVICE jobs. */

    @Test

    @EnableFlags(Flags.FLAG_ENFORCE_QUOTA_POLICY_TO_FGS_JOBS)

    public void testTimerTracking_Fgs() {

        setDischarging();
@@ -5259,7 +5257,6 @@ public class QuotaControllerTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ENFORCE_QUOTA_POLICY_TO_FGS_JOBS)

    public void testTracking_OutOfQuota_ForegroundAndBackground_CompactChangeOverrides() {

        setDischarging();