Merge "JobScheduler: Cleanup FLAG_TUNE_QUOTA_WINDOW_DEFAULT_PARAMETERS" into main (ecb3cb27) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/aconfig/job.aconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -90,16 +90,6 @@ flag {
		}
		}

		flag {
		name: "tune_quota_window_default_parameters"
		namespace: "backstage_power"
		description: "Tune default active/exempted bucket quota parameters"
		bug: "401767691"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "deviceidlejobcontroller_off_main_thread"
		namespace: "backstage_power"

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

+15 −39

Original line number	Diff line number	Diff line
		@@ -3239,10 +3239,6 @@ public final class QuotaController extends StateController {
		private static final long DEFAULT_LEGACY_WINDOW_SIZE_FREQUENT_MS =
		8 * 60 * 60 * 1000L; // 8 hours

		private static final long DEFAULT_CURRENT_WINDOW_SIZE_EXEMPTED_MS =
		20 * 60 * 1000L; // 20 minutes.
		private static final long DEFAULT_CURRENT_WINDOW_SIZE_ACTIVE_MS =
		30 * 60 * 1000L; // 30 minutes.
		private static final long DEFAULT_CURRENT_WINDOW_SIZE_WORKING_MS =
		4 * 60 * 60 * 1000L; // 4 hours
		private static final long DEFAULT_CURRENT_WINDOW_SIZE_FREQUENT_MS =
		@@ -3628,23 +3624,15 @@ public final class QuotaController extends StateController {
		WINDOW_SIZE_WORKING_MS = DEFAULT_LEGACY_WINDOW_SIZE_WORKING_MS;
		WINDOW_SIZE_FREQUENT_MS = DEFAULT_LEGACY_WINDOW_SIZE_FREQUENT_MS;
		} else {
		ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS = Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS :
		DEFAULT_LEGACY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS;
		ALLOWED_TIME_PER_PERIOD_ACTIVE_MS = Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS :
		DEFAULT_LEGACY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS;
		ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS =
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS;
		ALLOWED_TIME_PER_PERIOD_ACTIVE_MS =
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS;
		ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS =
		Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS :
		DEFAULT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS;
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS;

		WINDOW_SIZE_EXEMPTED_MS = Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_LATEST_WINDOW_SIZE_EXEMPTED_MS :
		DEFAULT_CURRENT_WINDOW_SIZE_EXEMPTED_MS;
		WINDOW_SIZE_ACTIVE_MS = Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_LATEST_WINDOW_SIZE_ACTIVE_MS :
		DEFAULT_CURRENT_WINDOW_SIZE_ACTIVE_MS;
		WINDOW_SIZE_EXEMPTED_MS = DEFAULT_LATEST_WINDOW_SIZE_EXEMPTED_MS;
		WINDOW_SIZE_ACTIVE_MS = DEFAULT_LATEST_WINDOW_SIZE_ACTIVE_MS;
		WINDOW_SIZE_WORKING_MS = DEFAULT_CURRENT_WINDOW_SIZE_WORKING_MS;
		WINDOW_SIZE_FREQUENT_MS = DEFAULT_CURRENT_WINDOW_SIZE_FREQUENT_MS;
		}
		@@ -3973,14 +3961,10 @@ public final class QuotaController extends StateController {
		KEY_WINDOW_SIZE_RESTRICTED_MS);
		ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS =
		properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS,
		Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS :
		DEFAULT_LEGACY_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS);
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_EXEMPTED_MS);
		ALLOWED_TIME_PER_PERIOD_ACTIVE_MS =
		properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS,
		Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS :
		DEFAULT_LEGACY_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS);
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ACTIVE_MS);
		ALLOWED_TIME_PER_PERIOD_WORKING_MS =
		properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_WORKING_MS,
		DEFAULT_ALLOWED_TIME_PER_PERIOD_WORKING_MS);
		@@ -3995,27 +3979,19 @@ public final class QuotaController extends StateController {
		DEFAULT_ALLOWED_TIME_PER_PERIOD_RESTRICTED_MS);
		ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS =
		properties.getLong(KEY_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS,
		Flags.tuneQuotaWindowDefaultParameters()
		? DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS
		: DEFAULT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS);
		DEFAULT_CURRENT_ALLOWED_TIME_PER_PERIOD_ADDITION_INSTALLER_MS);
		IN_QUOTA_BUFFER_MS = properties.getLong(KEY_IN_QUOTA_BUFFER_MS,
		DEFAULT_IN_QUOTA_BUFFER_MS);
		MAX_EXECUTION_TIME_MS = properties.getLong(KEY_MAX_EXECUTION_TIME_MS,
		DEFAULT_MAX_EXECUTION_TIME_MS);
		WINDOW_SIZE_EXEMPTED_MS = properties.getLong(KEY_WINDOW_SIZE_EXEMPTED_MS,
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled
		&& Flags.tuneQuotaWindowDefaultParameters())
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled)
		? DEFAULT_LATEST_WINDOW_SIZE_EXEMPTED_MS :
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled
		? DEFAULT_CURRENT_WINDOW_SIZE_EXEMPTED_MS :
		DEFAULT_LEGACY_WINDOW_SIZE_EXEMPTED_MS));
		DEFAULT_LEGACY_WINDOW_SIZE_EXEMPTED_MS);
		WINDOW_SIZE_ACTIVE_MS = properties.getLong(KEY_WINDOW_SIZE_ACTIVE_MS,
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled
		&& Flags.tuneQuotaWindowDefaultParameters())
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled)
		? DEFAULT_LATEST_WINDOW_SIZE_ACTIVE_MS :
		(Flags.adjustQuotaDefaultConstants() && !isCompatEnabled
		? DEFAULT_CURRENT_WINDOW_SIZE_ACTIVE_MS :
		DEFAULT_LEGACY_WINDOW_SIZE_ACTIVE_MS));
		DEFAULT_LEGACY_WINDOW_SIZE_ACTIVE_MS);
		WINDOW_SIZE_WORKING_MS =
		properties.getLong(KEY_WINDOW_SIZE_WORKING_MS,
		Flags.adjustQuotaDefaultConstants() && !isCompatEnabled

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

+1 −504

File changed.

Preview size limit exceeded, changes collapsed.