Knobs for connectivity experiments.
We keep the sane default values of 50% through a job window for
delaying on congested networks and promoting prefetch jobs, but now
allow experiments to override these values.
There's only ever one of each controller, so just create it tied to
the JobSchedulerService that owns it. (People that need hooks for
testing can provide a mock JSS, instead of doing extra constructor
overloads.)
Use IndentingPrintWriter for dumping constants.
Test: bit FrameworksServicesTests:com.android.server.job.
Bug: 72353440, 73019091
Change-Id: Icdb40ee3b0bb22a20ed821888b42b87f33eb49ec
diff --git a/core/proto/android/server/jobscheduler.proto b/core/proto/android/server/jobscheduler.proto
index 304e63f..2d31c5a 100644
--- a/core/proto/android/server/jobscheduler.proto
+++ b/core/proto/android/server/jobscheduler.proto
@@ -201,6 +201,12 @@
// be indices into this array, rather than the raw constants used by
// AppIdleHistory.
repeated int32 standby_beats = 20;
+ // The fraction of a job's running window that must pass before we
+ // consider running it when the network is congested.
+ optional double conn_congestion_delay_frac = 21;
+ // The fraction of a prefetch job's running window that must pass before
+ // we consider matching it against a metered network.
+ optional double conn_prefetch_relax_frac = 22;
}
message StateControllerProto {
diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index ff4e1e2..740866c 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -164,15 +164,16 @@
* {@link JobStatus#getServiceToken()}
*/
final List<JobServiceContext> mActiveServices = new ArrayList<>();
+
/** List of controllers that will notify this service of updates to jobs. */
- List<StateController> mControllers;
+ private final List<StateController> mControllers;
/** Need direct access to this for testing. */
- BatteryController mBatteryController;
+ private final BatteryController mBatteryController;
/** Need direct access to this for testing. */
- StorageController mStorageController;
+ private final StorageController mStorageController;
/** Need directly for sending uid state changes */
- private BackgroundJobsController mBackgroundJobsController;
- private DeviceIdleJobsController mDeviceIdleJobsController;
+ private final DeviceIdleJobsController mDeviceIdleJobsController;
+
/**
* Queue of pending jobs. The JobServiceContext class will receive jobs from this list
* when ready to execute them.
@@ -254,12 +255,48 @@
*/
int[] mTmpAssignPreferredUidForContext = new int[MAX_JOB_CONTEXTS_COUNT];
+ private class ConstantsObserver extends ContentObserver {
+ private ContentResolver mResolver;
+
+ public ConstantsObserver(Handler handler) {
+ super(handler);
+ }
+
+ public void start(ContentResolver resolver) {
+ mResolver = resolver;
+ mResolver.registerContentObserver(Settings.Global.getUriFor(
+ Settings.Global.JOB_SCHEDULER_CONSTANTS), false, this);
+ updateConstants();
+ }
+
+ @Override
+ public void onChange(boolean selfChange, Uri uri) {
+ updateConstants();
+ }
+
+ private void updateConstants() {
+ synchronized (mLock) {
+ try {
+ mConstants.updateConstantsLocked(Settings.Global.getString(mResolver,
+ Settings.Global.JOB_SCHEDULER_CONSTANTS));
+ } catch (IllegalArgumentException e) {
+ // Failed to parse the settings string, log this and move on
+ // with defaults.
+ Slog.e(TAG, "Bad jobscheduler settings", e);
+ }
+ }
+
+ // Reset the heartbeat alarm based on the new heartbeat duration
+ setNextHeartbeatAlarm();
+ }
+ }
+
/**
* All times are in milliseconds. These constants are kept synchronized with the system
* global Settings. Any access to this class or its fields should be done while
* holding the JobSchedulerService.mLock lock.
*/
- private final class Constants extends ContentObserver {
+ public static class Constants {
// Key names stored in the settings value.
private static final String KEY_MIN_IDLE_COUNT = "min_idle_count";
private static final String KEY_MIN_CHARGING_COUNT = "min_charging_count";
@@ -284,6 +321,8 @@
private static final String KEY_STANDBY_WORKING_BEATS = "standby_working_beats";
private static final String KEY_STANDBY_FREQUENT_BEATS = "standby_frequent_beats";
private static final String KEY_STANDBY_RARE_BEATS = "standby_rare_beats";
+ private static final String KEY_CONN_CONGESTION_DELAY_FRAC = "conn_congestion_delay_frac";
+ private static final String KEY_CONN_PREFETCH_RELAX_FRAC = "conn_prefetch_relax_frac";
private static final int DEFAULT_MIN_IDLE_COUNT = 1;
private static final int DEFAULT_MIN_CHARGING_COUNT = 1;
@@ -307,6 +346,8 @@
private static final int DEFAULT_STANDBY_WORKING_BEATS = 11; // ~ 2 hours, with 11min beats
private static final int DEFAULT_STANDBY_FREQUENT_BEATS = 43; // ~ 8 hours
private static final int DEFAULT_STANDBY_RARE_BEATS = 130; // ~ 24 hours
+ private static final float DEFAULT_CONN_CONGESTION_DELAY_FRAC = 0.5f;
+ private static final float DEFAULT_CONN_PREFETCH_RELAX_FRAC = 0.5f;
/**
* Minimum # of idle jobs that must be ready in order to force the JMS to schedule things
@@ -401,7 +442,6 @@
* hour or day, so that the heartbeat drifts relative to wall-clock milestones.
*/
long STANDBY_HEARTBEAT_TIME = DEFAULT_STANDBY_HEARTBEAT_TIME;
-
/**
* Mapping: standby bucket -> number of heartbeats between each sweep of that
* bucket's jobs.
@@ -416,171 +456,126 @@
DEFAULT_STANDBY_FREQUENT_BEATS,
DEFAULT_STANDBY_RARE_BEATS
};
+ /**
+ * The fraction of a job's running window that must pass before we
+ * consider running it when the network is congested.
+ */
+ public float CONN_CONGESTION_DELAY_FRAC = DEFAULT_CONN_CONGESTION_DELAY_FRAC;
+ /**
+ * The fraction of a prefetch job's running window that must pass before
+ * we consider matching it against a metered network.
+ */
+ public float CONN_PREFETCH_RELAX_FRAC = DEFAULT_CONN_PREFETCH_RELAX_FRAC;
- private ContentResolver mResolver;
private final KeyValueListParser mParser = new KeyValueListParser(',');
- public Constants(Handler handler) {
- super(handler);
- }
-
- public void start(ContentResolver resolver) {
- mResolver = resolver;
- mResolver.registerContentObserver(Settings.Global.getUriFor(
- Settings.Global.JOB_SCHEDULER_CONSTANTS), false, this);
- updateConstants();
- }
-
- @Override
- public void onChange(boolean selfChange, Uri uri) {
- updateConstants();
- }
-
- private void updateConstants() {
- synchronized (mLock) {
- try {
- mParser.setString(Settings.Global.getString(mResolver,
- Settings.Global.JOB_SCHEDULER_CONSTANTS));
- } catch (IllegalArgumentException e) {
- // Failed to parse the settings string, log this and move on
- // with defaults.
- Slog.e(TAG, "Bad jobscheduler settings", e);
- }
-
- MIN_IDLE_COUNT = mParser.getInt(KEY_MIN_IDLE_COUNT,
- DEFAULT_MIN_IDLE_COUNT);
- MIN_CHARGING_COUNT = mParser.getInt(KEY_MIN_CHARGING_COUNT,
- DEFAULT_MIN_CHARGING_COUNT);
- MIN_BATTERY_NOT_LOW_COUNT = mParser.getInt(KEY_MIN_BATTERY_NOT_LOW_COUNT,
- DEFAULT_MIN_BATTERY_NOT_LOW_COUNT);
- MIN_STORAGE_NOT_LOW_COUNT = mParser.getInt(KEY_MIN_STORAGE_NOT_LOW_COUNT,
- DEFAULT_MIN_STORAGE_NOT_LOW_COUNT);
- MIN_CONNECTIVITY_COUNT = mParser.getInt(KEY_MIN_CONNECTIVITY_COUNT,
- DEFAULT_MIN_CONNECTIVITY_COUNT);
- MIN_CONTENT_COUNT = mParser.getInt(KEY_MIN_CONTENT_COUNT,
- DEFAULT_MIN_CONTENT_COUNT);
- MIN_READY_JOBS_COUNT = mParser.getInt(KEY_MIN_READY_JOBS_COUNT,
- DEFAULT_MIN_READY_JOBS_COUNT);
- HEAVY_USE_FACTOR = mParser.getFloat(KEY_HEAVY_USE_FACTOR,
- DEFAULT_HEAVY_USE_FACTOR);
- MODERATE_USE_FACTOR = mParser.getFloat(KEY_MODERATE_USE_FACTOR,
- DEFAULT_MODERATE_USE_FACTOR);
- FG_JOB_COUNT = mParser.getInt(KEY_FG_JOB_COUNT,
- DEFAULT_FG_JOB_COUNT);
- BG_NORMAL_JOB_COUNT = mParser.getInt(KEY_BG_NORMAL_JOB_COUNT,
- DEFAULT_BG_NORMAL_JOB_COUNT);
- if ((FG_JOB_COUNT+BG_NORMAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
- BG_NORMAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
- }
- BG_MODERATE_JOB_COUNT = mParser.getInt(KEY_BG_MODERATE_JOB_COUNT,
- DEFAULT_BG_MODERATE_JOB_COUNT);
- if ((FG_JOB_COUNT+BG_MODERATE_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
- BG_MODERATE_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
- }
- BG_LOW_JOB_COUNT = mParser.getInt(KEY_BG_LOW_JOB_COUNT,
- DEFAULT_BG_LOW_JOB_COUNT);
- if ((FG_JOB_COUNT+BG_LOW_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
- BG_LOW_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
- }
- BG_CRITICAL_JOB_COUNT = mParser.getInt(KEY_BG_CRITICAL_JOB_COUNT,
- DEFAULT_BG_CRITICAL_JOB_COUNT);
- if ((FG_JOB_COUNT+BG_CRITICAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
- BG_CRITICAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
- }
- MAX_STANDARD_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_STANDARD_RESCHEDULE_COUNT,
- DEFAULT_MAX_STANDARD_RESCHEDULE_COUNT);
- MAX_WORK_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_WORK_RESCHEDULE_COUNT,
- DEFAULT_MAX_WORK_RESCHEDULE_COUNT);
- MIN_LINEAR_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_LINEAR_BACKOFF_TIME,
- DEFAULT_MIN_LINEAR_BACKOFF_TIME);
- MIN_EXP_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_EXP_BACKOFF_TIME,
- DEFAULT_MIN_EXP_BACKOFF_TIME);
- STANDBY_HEARTBEAT_TIME = mParser.getDurationMillis(KEY_STANDBY_HEARTBEAT_TIME,
- DEFAULT_STANDBY_HEARTBEAT_TIME);
- STANDBY_BEATS[1] = mParser.getInt(KEY_STANDBY_WORKING_BEATS,
- DEFAULT_STANDBY_WORKING_BEATS);
- STANDBY_BEATS[2] = mParser.getInt(KEY_STANDBY_FREQUENT_BEATS,
- DEFAULT_STANDBY_FREQUENT_BEATS);
- STANDBY_BEATS[3] = mParser.getInt(KEY_STANDBY_RARE_BEATS,
- DEFAULT_STANDBY_RARE_BEATS);
+ void updateConstantsLocked(String value) {
+ try {
+ mParser.setString(value);
+ } catch (Exception e) {
+ // Failed to parse the settings string, log this and move on
+ // with defaults.
+ Slog.e(TAG, "Bad jobscheduler settings", e);
}
- // Reset the heartbeat alarm based on the new heartbeat duration
- setNextHeartbeatAlarm();
+ MIN_IDLE_COUNT = mParser.getInt(KEY_MIN_IDLE_COUNT,
+ DEFAULT_MIN_IDLE_COUNT);
+ MIN_CHARGING_COUNT = mParser.getInt(KEY_MIN_CHARGING_COUNT,
+ DEFAULT_MIN_CHARGING_COUNT);
+ MIN_BATTERY_NOT_LOW_COUNT = mParser.getInt(KEY_MIN_BATTERY_NOT_LOW_COUNT,
+ DEFAULT_MIN_BATTERY_NOT_LOW_COUNT);
+ MIN_STORAGE_NOT_LOW_COUNT = mParser.getInt(KEY_MIN_STORAGE_NOT_LOW_COUNT,
+ DEFAULT_MIN_STORAGE_NOT_LOW_COUNT);
+ MIN_CONNECTIVITY_COUNT = mParser.getInt(KEY_MIN_CONNECTIVITY_COUNT,
+ DEFAULT_MIN_CONNECTIVITY_COUNT);
+ MIN_CONTENT_COUNT = mParser.getInt(KEY_MIN_CONTENT_COUNT,
+ DEFAULT_MIN_CONTENT_COUNT);
+ MIN_READY_JOBS_COUNT = mParser.getInt(KEY_MIN_READY_JOBS_COUNT,
+ DEFAULT_MIN_READY_JOBS_COUNT);
+ HEAVY_USE_FACTOR = mParser.getFloat(KEY_HEAVY_USE_FACTOR,
+ DEFAULT_HEAVY_USE_FACTOR);
+ MODERATE_USE_FACTOR = mParser.getFloat(KEY_MODERATE_USE_FACTOR,
+ DEFAULT_MODERATE_USE_FACTOR);
+ FG_JOB_COUNT = mParser.getInt(KEY_FG_JOB_COUNT,
+ DEFAULT_FG_JOB_COUNT);
+ BG_NORMAL_JOB_COUNT = mParser.getInt(KEY_BG_NORMAL_JOB_COUNT,
+ DEFAULT_BG_NORMAL_JOB_COUNT);
+ if ((FG_JOB_COUNT+BG_NORMAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
+ BG_NORMAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
+ }
+ BG_MODERATE_JOB_COUNT = mParser.getInt(KEY_BG_MODERATE_JOB_COUNT,
+ DEFAULT_BG_MODERATE_JOB_COUNT);
+ if ((FG_JOB_COUNT+BG_MODERATE_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
+ BG_MODERATE_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
+ }
+ BG_LOW_JOB_COUNT = mParser.getInt(KEY_BG_LOW_JOB_COUNT,
+ DEFAULT_BG_LOW_JOB_COUNT);
+ if ((FG_JOB_COUNT+BG_LOW_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
+ BG_LOW_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
+ }
+ BG_CRITICAL_JOB_COUNT = mParser.getInt(KEY_BG_CRITICAL_JOB_COUNT,
+ DEFAULT_BG_CRITICAL_JOB_COUNT);
+ if ((FG_JOB_COUNT+BG_CRITICAL_JOB_COUNT) > MAX_JOB_CONTEXTS_COUNT) {
+ BG_CRITICAL_JOB_COUNT = MAX_JOB_CONTEXTS_COUNT - FG_JOB_COUNT;
+ }
+ MAX_STANDARD_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_STANDARD_RESCHEDULE_COUNT,
+ DEFAULT_MAX_STANDARD_RESCHEDULE_COUNT);
+ MAX_WORK_RESCHEDULE_COUNT = mParser.getInt(KEY_MAX_WORK_RESCHEDULE_COUNT,
+ DEFAULT_MAX_WORK_RESCHEDULE_COUNT);
+ MIN_LINEAR_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_LINEAR_BACKOFF_TIME,
+ DEFAULT_MIN_LINEAR_BACKOFF_TIME);
+ MIN_EXP_BACKOFF_TIME = mParser.getDurationMillis(KEY_MIN_EXP_BACKOFF_TIME,
+ DEFAULT_MIN_EXP_BACKOFF_TIME);
+ STANDBY_HEARTBEAT_TIME = mParser.getDurationMillis(KEY_STANDBY_HEARTBEAT_TIME,
+ DEFAULT_STANDBY_HEARTBEAT_TIME);
+ STANDBY_BEATS[1] = mParser.getInt(KEY_STANDBY_WORKING_BEATS,
+ DEFAULT_STANDBY_WORKING_BEATS);
+ STANDBY_BEATS[2] = mParser.getInt(KEY_STANDBY_FREQUENT_BEATS,
+ DEFAULT_STANDBY_FREQUENT_BEATS);
+ STANDBY_BEATS[3] = mParser.getInt(KEY_STANDBY_RARE_BEATS,
+ DEFAULT_STANDBY_RARE_BEATS);
+ CONN_CONGESTION_DELAY_FRAC = mParser.getFloat(KEY_CONN_CONGESTION_DELAY_FRAC,
+ DEFAULT_CONN_CONGESTION_DELAY_FRAC);
+ CONN_PREFETCH_RELAX_FRAC = mParser.getFloat(KEY_CONN_PREFETCH_RELAX_FRAC,
+ DEFAULT_CONN_PREFETCH_RELAX_FRAC);
}
- void dump(PrintWriter pw) {
- pw.println(" Settings:");
-
- pw.print(" "); pw.print(KEY_MIN_IDLE_COUNT); pw.print("=");
- pw.print(MIN_IDLE_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_CHARGING_COUNT); pw.print("=");
- pw.print(MIN_CHARGING_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_BATTERY_NOT_LOW_COUNT); pw.print("=");
- pw.print(MIN_BATTERY_NOT_LOW_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_STORAGE_NOT_LOW_COUNT); pw.print("=");
- pw.print(MIN_STORAGE_NOT_LOW_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_CONNECTIVITY_COUNT); pw.print("=");
- pw.print(MIN_CONNECTIVITY_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_CONTENT_COUNT); pw.print("=");
- pw.print(MIN_CONTENT_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_READY_JOBS_COUNT); pw.print("=");
- pw.print(MIN_READY_JOBS_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_HEAVY_USE_FACTOR); pw.print("=");
- pw.print(HEAVY_USE_FACTOR); pw.println();
-
- pw.print(" "); pw.print(KEY_MODERATE_USE_FACTOR); pw.print("=");
- pw.print(MODERATE_USE_FACTOR); pw.println();
-
- pw.print(" "); pw.print(KEY_FG_JOB_COUNT); pw.print("=");
- pw.print(FG_JOB_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_BG_NORMAL_JOB_COUNT); pw.print("=");
- pw.print(BG_NORMAL_JOB_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_BG_MODERATE_JOB_COUNT); pw.print("=");
- pw.print(BG_MODERATE_JOB_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_BG_LOW_JOB_COUNT); pw.print("=");
- pw.print(BG_LOW_JOB_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_BG_CRITICAL_JOB_COUNT); pw.print("=");
- pw.print(BG_CRITICAL_JOB_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MAX_STANDARD_RESCHEDULE_COUNT); pw.print("=");
- pw.print(MAX_STANDARD_RESCHEDULE_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MAX_WORK_RESCHEDULE_COUNT); pw.print("=");
- pw.print(MAX_WORK_RESCHEDULE_COUNT); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_LINEAR_BACKOFF_TIME); pw.print("=");
- pw.print(MIN_LINEAR_BACKOFF_TIME); pw.println();
-
- pw.print(" "); pw.print(KEY_MIN_EXP_BACKOFF_TIME); pw.print("=");
- pw.print(MIN_EXP_BACKOFF_TIME); pw.println();
-
- pw.print(" "); pw.print(KEY_STANDBY_HEARTBEAT_TIME); pw.print("=");
- pw.print(STANDBY_HEARTBEAT_TIME); pw.println();
-
- pw.print(" standby_beats={");
+ void dump(IndentingPrintWriter pw) {
+ pw.println("Settings:");
+ pw.increaseIndent();
+ pw.printPair(KEY_MIN_IDLE_COUNT, MIN_IDLE_COUNT).println();
+ pw.printPair(KEY_MIN_CHARGING_COUNT, MIN_CHARGING_COUNT).println();
+ pw.printPair(KEY_MIN_BATTERY_NOT_LOW_COUNT, MIN_BATTERY_NOT_LOW_COUNT).println();
+ pw.printPair(KEY_MIN_STORAGE_NOT_LOW_COUNT, MIN_STORAGE_NOT_LOW_COUNT).println();
+ pw.printPair(KEY_MIN_CONNECTIVITY_COUNT, MIN_CONNECTIVITY_COUNT).println();
+ pw.printPair(KEY_MIN_CONTENT_COUNT, MIN_CONTENT_COUNT).println();
+ pw.printPair(KEY_MIN_READY_JOBS_COUNT, MIN_READY_JOBS_COUNT).println();
+ pw.printPair(KEY_HEAVY_USE_FACTOR, HEAVY_USE_FACTOR).println();
+ pw.printPair(KEY_MODERATE_USE_FACTOR, MODERATE_USE_FACTOR).println();
+ pw.printPair(KEY_FG_JOB_COUNT, FG_JOB_COUNT).println();
+ pw.printPair(KEY_BG_NORMAL_JOB_COUNT, BG_NORMAL_JOB_COUNT).println();
+ pw.printPair(KEY_BG_MODERATE_JOB_COUNT, BG_MODERATE_JOB_COUNT).println();
+ pw.printPair(KEY_BG_LOW_JOB_COUNT, BG_LOW_JOB_COUNT).println();
+ pw.printPair(KEY_BG_CRITICAL_JOB_COUNT, BG_CRITICAL_JOB_COUNT).println();
+ pw.printPair(KEY_MAX_STANDARD_RESCHEDULE_COUNT, MAX_STANDARD_RESCHEDULE_COUNT).println();
+ pw.printPair(KEY_MAX_WORK_RESCHEDULE_COUNT, MAX_WORK_RESCHEDULE_COUNT).println();
+ pw.printPair(KEY_MIN_LINEAR_BACKOFF_TIME, MIN_LINEAR_BACKOFF_TIME).println();
+ pw.printPair(KEY_MIN_EXP_BACKOFF_TIME, MIN_EXP_BACKOFF_TIME).println();
+ pw.printPair(KEY_STANDBY_HEARTBEAT_TIME, STANDBY_HEARTBEAT_TIME).println();
+ pw.print("standby_beats={");
pw.print(STANDBY_BEATS[0]);
for (int i = 1; i < STANDBY_BEATS.length; i++) {
pw.print(", ");
pw.print(STANDBY_BEATS[i]);
}
pw.println('}');
+ pw.printPair(KEY_CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC).println();
+ pw.printPair(KEY_CONN_PREFETCH_RELAX_FRAC, CONN_PREFETCH_RELAX_FRAC).println();
+ pw.decreaseIndent();
}
void dump(ProtoOutputStream proto, long fieldId) {
final long token = proto.start(fieldId);
-
proto.write(ConstantsProto.MIN_IDLE_COUNT, MIN_IDLE_COUNT);
proto.write(ConstantsProto.MIN_CHARGING_COUNT, MIN_CHARGING_COUNT);
proto.write(ConstantsProto.MIN_BATTERY_NOT_LOW_COUNT, MIN_BATTERY_NOT_LOW_COUNT);
@@ -600,16 +595,17 @@
proto.write(ConstantsProto.MIN_LINEAR_BACKOFF_TIME_MS, MIN_LINEAR_BACKOFF_TIME);
proto.write(ConstantsProto.MIN_EXP_BACKOFF_TIME_MS, MIN_EXP_BACKOFF_TIME);
proto.write(ConstantsProto.STANDBY_HEARTBEAT_TIME_MS, STANDBY_HEARTBEAT_TIME);
-
for (int period : STANDBY_BEATS) {
proto.write(ConstantsProto.STANDBY_BEATS, period);
}
-
+ proto.write(ConstantsProto.CONN_CONGESTION_DELAY_FRAC, CONN_CONGESTION_DELAY_FRAC);
+ proto.write(ConstantsProto.CONN_PREFETCH_RELAX_FRAC, CONN_PREFETCH_RELAX_FRAC);
proto.end(token);
}
}
final Constants mConstants;
+ final ConstantsObserver mConstantsObserver;
static final Comparator<JobStatus> mEnqueueTimeComparator = (o1, o2) -> {
if (o1.enqueueTime < o2.enqueueTime) {
@@ -779,6 +775,10 @@
return mJobs;
}
+ public Constants getConstants() {
+ return mConstants;
+ }
+
@Override
public void onStartUser(int userHandle) {
mStartedUsers = ArrayUtils.appendInt(mStartedUsers, userHandle);
@@ -1098,7 +1098,8 @@
LocalServices.getService(ActivityManagerInternal.class));
mHandler = new JobHandler(context.getMainLooper());
- mConstants = new Constants(mHandler);
+ mConstants = new Constants();
+ mConstantsObserver = new ConstantsObserver(mHandler);
mJobSchedulerStub = new JobSchedulerStub();
// Set up the app standby bucketing tracker
@@ -1114,17 +1115,17 @@
// Create the controllers.
mControllers = new ArrayList<StateController>();
- mControllers.add(ConnectivityController.get(this));
- mControllers.add(TimeController.get(this));
- mControllers.add(IdleController.get(this));
- mBatteryController = BatteryController.get(this);
+ mControllers.add(new ConnectivityController(this));
+ mControllers.add(new TimeController(this));
+ mControllers.add(new IdleController(this));
+ mBatteryController = new BatteryController(this);
mControllers.add(mBatteryController);
- mStorageController = StorageController.get(this);
+ mStorageController = new StorageController(this);
mControllers.add(mStorageController);
- mControllers.add(BackgroundJobsController.get(this));
- mControllers.add(AppIdleController.get(this));
- mControllers.add(ContentObserverController.get(this));
- mDeviceIdleJobsController = DeviceIdleJobsController.get(this);
+ mControllers.add(new BackgroundJobsController(this));
+ mControllers.add(new AppIdleController(this));
+ mControllers.add(new ContentObserverController(this));
+ mDeviceIdleJobsController = new DeviceIdleJobsController(this);
mControllers.add(mDeviceIdleJobsController);
// If the job store determined that it can't yet reschedule persisted jobs,
@@ -1185,7 +1186,7 @@
@Override
public void onBootPhase(int phase) {
if (PHASE_SYSTEM_SERVICES_READY == phase) {
- mConstants.start(getContext().getContentResolver());
+ mConstantsObserver.start(getContext().getContentResolver());
mAppStateTracker = Preconditions.checkNotNull(
LocalServices.getService(AppStateTracker.class));
diff --git a/services/core/java/com/android/server/job/controllers/AppIdleController.java b/services/core/java/com/android/server/job/controllers/AppIdleController.java
index 4b48824..bd8fe28 100644
--- a/services/core/java/com/android/server/job/controllers/AppIdleController.java
+++ b/services/core/java/com/android/server/job/controllers/AppIdleController.java
@@ -17,7 +17,6 @@
package com.android.server.job.controllers;
import android.app.usage.UsageStatsManagerInternal;
-import android.content.Context;
import android.os.UserHandle;
import android.util.Log;
import android.util.Slog;
@@ -42,10 +41,6 @@
private static final boolean DEBUG = JobSchedulerService.DEBUG
|| Log.isLoggable(TAG, Log.DEBUG);
- // Singleton factory
- private static Object sCreationLock = new Object();
- private static volatile AppIdleController sController;
- private final JobSchedulerService mJobSchedulerService;
private final UsageStatsManagerInternal mUsageStatsInternal;
private boolean mInitializedParoleOn;
boolean mAppIdleParoleOn;
@@ -94,19 +89,8 @@
}
}
- public static AppIdleController get(JobSchedulerService service) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new AppIdleController(service, service.getContext(),
- service.getLock());
- }
- return sController;
- }
- }
-
- private AppIdleController(JobSchedulerService service, Context context, Object lock) {
- super(service, context, lock);
- mJobSchedulerService = service;
+ public AppIdleController(JobSchedulerService service) {
+ super(service);
mUsageStatsInternal = LocalServices.getService(UsageStatsManagerInternal.class);
mAppIdleParoleOn = true;
mUsageStatsInternal.addAppIdleStateChangeListener(new AppIdleStateChangeListener());
@@ -139,7 +123,7 @@
pw.println("Parole on: " + mAppIdleParoleOn);
pw.println();
- mJobSchedulerService.getJobStore().forEachJob(predicate, (jobStatus) -> {
+ mService.getJobStore().forEachJob(predicate, (jobStatus) -> {
pw.print("#");
jobStatus.printUniqueId(pw);
pw.print(" from ");
@@ -162,7 +146,7 @@
proto.write(StateControllerProto.AppIdleController.IS_PAROLE_ON, mAppIdleParoleOn);
- mJobSchedulerService.getJobStore().forEachJob(predicate, (js) -> {
+ mService.getJobStore().forEachJob(predicate, (js) -> {
final long jsToken =
proto.start(StateControllerProto.AppIdleController.TRACKED_JOBS);
js.writeToShortProto(proto, StateControllerProto.AppIdleController.TrackedJob.INFO);
@@ -189,7 +173,7 @@
}
mAppIdleParoleOn = isAppIdleParoleOn;
GlobalUpdateFunc update = new GlobalUpdateFunc();
- mJobSchedulerService.getJobStore().forEachJob(update);
+ mService.getJobStore().forEachJob(update);
if (update.mChanged) {
changed = true;
}
@@ -210,7 +194,7 @@
}
PackageUpdateFunc update = new PackageUpdateFunc(userId, packageName, idle);
- mJobSchedulerService.getJobStore().forEachJob(update);
+ mService.getJobStore().forEachJob(update);
if (update.mChanged) {
changed = true;
}
diff --git a/services/core/java/com/android/server/job/controllers/BackgroundJobsController.java b/services/core/java/com/android/server/job/controllers/BackgroundJobsController.java
index 7a09fc4..36e7511 100644
--- a/services/core/java/com/android/server/job/controllers/BackgroundJobsController.java
+++ b/services/core/java/com/android/server/job/controllers/BackgroundJobsController.java
@@ -16,7 +16,6 @@
package com.android.server.job.controllers;
-import android.content.Context;
import android.os.SystemClock;
import android.os.UserHandle;
import android.util.Log;
@@ -40,27 +39,10 @@
private static final boolean DEBUG = JobSchedulerService.DEBUG
|| Log.isLoggable(TAG, Log.DEBUG);
- // Singleton factory
- private static final Object sCreationLock = new Object();
- private static volatile BackgroundJobsController sController;
-
- private final JobSchedulerService mJobSchedulerService;
-
private final AppStateTracker mAppStateTracker;
- public static BackgroundJobsController get(JobSchedulerService service) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new BackgroundJobsController(service, service.getContext(),
- service.getLock());
- }
- return sController;
- }
- }
-
- private BackgroundJobsController(JobSchedulerService service, Context context, Object lock) {
- super(service, context, lock);
- mJobSchedulerService = service;
+ public BackgroundJobsController(JobSchedulerService service) {
+ super(service);
mAppStateTracker = Preconditions.checkNotNull(
LocalServices.getService(AppStateTracker.class));
@@ -83,7 +65,7 @@
mAppStateTracker.dump(pw);
pw.println();
- mJobSchedulerService.getJobStore().forEachJob(predicate, (jobStatus) -> {
+ mService.getJobStore().forEachJob(predicate, (jobStatus) -> {
final int uid = jobStatus.getSourceUid();
final String sourcePkg = jobStatus.getSourcePackageName();
pw.print("#");
@@ -120,7 +102,7 @@
mAppStateTracker.dumpProto(proto,
StateControllerProto.BackgroundJobsController.FORCE_APP_STANDBY_TRACKER);
- mJobSchedulerService.getJobStore().forEachJob(predicate, (jobStatus) -> {
+ mService.getJobStore().forEachJob(predicate, (jobStatus) -> {
final long jsToken =
proto.start(StateControllerProto.BackgroundJobsController.TRACKED_JOBS);
@@ -171,7 +153,7 @@
final long start = DEBUG ? SystemClock.elapsedRealtimeNanos() : 0;
- mJobSchedulerService.getJobStore().forEachJob(updateTrackedJobs);
+ mService.getJobStore().forEachJob(updateTrackedJobs);
final long time = DEBUG ? (SystemClock.elapsedRealtimeNanos() - start) : 0;
if (DEBUG) {
diff --git a/services/core/java/com/android/server/job/controllers/BatteryController.java b/services/core/java/com/android/server/job/controllers/BatteryController.java
index 24491b0..46658ad 100644
--- a/services/core/java/com/android/server/job/controllers/BatteryController.java
+++ b/services/core/java/com/android/server/job/controllers/BatteryController.java
@@ -34,7 +34,6 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.LocalServices;
import com.android.server.job.JobSchedulerService;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import java.util.function.Predicate;
@@ -49,36 +48,16 @@
private static final boolean DEBUG = JobSchedulerService.DEBUG
|| Log.isLoggable(TAG, Log.DEBUG);
- private static final Object sCreationLock = new Object();
- private static volatile BatteryController sController;
-
private final ArraySet<JobStatus> mTrackedTasks = new ArraySet<>();
private ChargingTracker mChargeTracker;
- public static BatteryController get(JobSchedulerService taskManagerService) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new BatteryController(taskManagerService,
- taskManagerService.getContext(), taskManagerService.getLock());
- }
- }
- return sController;
- }
-
@VisibleForTesting
public ChargingTracker getTracker() {
return mChargeTracker;
}
- @VisibleForTesting
- public static BatteryController getForTesting(StateChangedListener stateChangedListener,
- Context context) {
- return new BatteryController(stateChangedListener, context, new Object());
- }
-
- private BatteryController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
+ public BatteryController(JobSchedulerService service) {
+ super(service);
mChargeTracker = new ChargingTracker();
mChargeTracker.startTracking();
}
diff --git a/services/core/java/com/android/server/job/controllers/ConnectivityController.java b/services/core/java/com/android/server/job/controllers/ConnectivityController.java
index dd07bc6..abe55bb 100644
--- a/services/core/java/com/android/server/job/controllers/ConnectivityController.java
+++ b/services/core/java/com/android/server/job/controllers/ConnectivityController.java
@@ -21,7 +21,6 @@
import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;
import android.app.job.JobInfo;
-import android.content.Context;
import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback;
import android.net.INetworkPolicyListener;
@@ -43,8 +42,8 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.job.JobSchedulerService;
+import com.android.server.job.JobSchedulerService.Constants;
import com.android.server.job.JobServiceContext;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import java.util.function.Predicate;
@@ -69,22 +68,8 @@
@GuardedBy("mLock")
private final ArraySet<JobStatus> mTrackedJobs = new ArraySet<>();
- /** Singleton. */
- private static ConnectivityController sSingleton;
- private static Object sCreationLock = new Object();
-
- public static ConnectivityController get(JobSchedulerService jms) {
- synchronized (sCreationLock) {
- if (sSingleton == null) {
- sSingleton = new ConnectivityController(jms, jms.getContext(), jms.getLock());
- }
- return sSingleton;
- }
- }
-
- private ConnectivityController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
+ public ConnectivityController(JobSchedulerService service) {
+ super(service);
mConnManager = mContext.getSystemService(ConnectivityManager.class);
mNetPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);
@@ -123,7 +108,7 @@
*/
@SuppressWarnings("unused")
private static boolean isInsane(JobStatus jobStatus, Network network,
- NetworkCapabilities capabilities) {
+ NetworkCapabilities capabilities, Constants constants) {
final long estimatedBytes = jobStatus.getEstimatedNetworkBytes();
if (estimatedBytes == JobInfo.NETWORK_BYTES_UNKNOWN) {
// We don't know how large the job is; cross our fingers!
@@ -154,11 +139,11 @@
@SuppressWarnings("unused")
private static boolean isCongestionDelayed(JobStatus jobStatus, Network network,
- NetworkCapabilities capabilities) {
+ NetworkCapabilities capabilities, Constants constants) {
// If network is congested, and job is less than 50% through the
// developer-requested window, then we're okay delaying the job.
if (!capabilities.hasCapability(NET_CAPABILITY_NOT_CONGESTED)) {
- return jobStatus.getFractionRunTime() < 0.5;
+ return jobStatus.getFractionRunTime() < constants.CONN_CONGESTION_DELAY_FRAC;
} else {
return false;
}
@@ -166,14 +151,14 @@
@SuppressWarnings("unused")
private static boolean isStrictSatisfied(JobStatus jobStatus, Network network,
- NetworkCapabilities capabilities) {
+ NetworkCapabilities capabilities, Constants constants) {
return jobStatus.getJob().getRequiredNetwork().networkCapabilities
.satisfiedByNetworkCapabilities(capabilities);
}
@SuppressWarnings("unused")
private static boolean isRelaxedSatisfied(JobStatus jobStatus, Network network,
- NetworkCapabilities capabilities) {
+ NetworkCapabilities capabilities, Constants constants) {
// Only consider doing this for prefetching jobs
if ((jobStatus.getJob().getFlags() & JobInfo.FLAG_IS_PREFETCH) == 0) {
return false;
@@ -185,7 +170,7 @@
.removeCapability(NET_CAPABILITY_NOT_METERED);
if (relaxed.satisfiedByNetworkCapabilities(capabilities)) {
// TODO: treat this as "maybe" response; need to check quotas
- return jobStatus.getFractionRunTime() > 0.5;
+ return jobStatus.getFractionRunTime() > constants.CONN_PREFETCH_RELAX_FRAC;
} else {
return false;
}
@@ -193,21 +178,21 @@
@VisibleForTesting
static boolean isSatisfied(JobStatus jobStatus, Network network,
- NetworkCapabilities capabilities) {
+ NetworkCapabilities capabilities, Constants constants) {
// Zeroth, we gotta have a network to think about being satisfied
if (network == null || capabilities == null) return false;
// First, are we insane?
- if (isInsane(jobStatus, network, capabilities)) return false;
+ if (isInsane(jobStatus, network, capabilities, constants)) return false;
// Second, is the network congested?
- if (isCongestionDelayed(jobStatus, network, capabilities)) return false;
+ if (isCongestionDelayed(jobStatus, network, capabilities, constants)) return false;
// Third, is the network a strict match?
- if (isStrictSatisfied(jobStatus, network, capabilities)) return true;
+ if (isStrictSatisfied(jobStatus, network, capabilities, constants)) return true;
// Third, is the network a relaxed match?
- if (isRelaxedSatisfied(jobStatus, network, capabilities)) return true;
+ if (isRelaxedSatisfied(jobStatus, network, capabilities, constants)) return true;
return false;
}
@@ -223,7 +208,7 @@
final NetworkCapabilities capabilities = mConnManager.getNetworkCapabilities(network);
final boolean connected = (info != null) && info.isConnected();
- final boolean satisfied = isSatisfied(jobStatus, network, capabilities);
+ final boolean satisfied = isSatisfied(jobStatus, network, capabilities, mConstants);
final boolean changed = jobStatus
.setConnectivityConstraintSatisfied(connected && satisfied);
diff --git a/services/core/java/com/android/server/job/controllers/ContentObserverController.java b/services/core/java/com/android/server/job/controllers/ContentObserverController.java
index 27f6c1e..a775cf5 100644
--- a/services/core/java/com/android/server/job/controllers/ContentObserverController.java
+++ b/services/core/java/com/android/server/job/controllers/ContentObserverController.java
@@ -18,7 +18,6 @@
import android.annotation.UserIdInt;
import android.app.job.JobInfo;
-import android.content.Context;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
@@ -31,10 +30,8 @@
import android.util.TimeUtils;
import android.util.proto.ProtoOutputStream;
-import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.job.JobSchedulerService;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import com.android.server.job.StateControllerProto.ContentObserverController.Observer.TriggerContentData;
@@ -61,9 +58,6 @@
*/
private static final int URIS_URGENT_THRESHOLD = 40;
- private static final Object sCreationLock = new Object();
- private static volatile ContentObserverController sController;
-
final private ArraySet<JobStatus> mTrackedTasks = new ArraySet<>();
/**
* Per-userid {@link JobInfo.TriggerContentUri} keyed ContentObserver cache.
@@ -72,26 +66,9 @@
new SparseArray<>();
final Handler mHandler;
- public static ContentObserverController get(JobSchedulerService taskManagerService) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new ContentObserverController(taskManagerService,
- taskManagerService.getContext(), taskManagerService.getLock());
- }
- }
- return sController;
- }
-
- @VisibleForTesting
- public static ContentObserverController getForTesting(StateChangedListener stateChangedListener,
- Context context) {
- return new ContentObserverController(stateChangedListener, context, new Object());
- }
-
- private ContentObserverController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
- mHandler = new Handler(context.getMainLooper());
+ public ContentObserverController(JobSchedulerService service) {
+ super(service);
+ mHandler = new Handler(mContext.getMainLooper());
}
@Override
diff --git a/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java b/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java
index aa60350..127a5c8 100644
--- a/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java
+++ b/services/core/java/com/android/server/job/controllers/DeviceIdleJobsController.java
@@ -57,10 +57,6 @@
static final int PROCESS_BACKGROUND_JOBS = 1;
- // Singleton factory
- private static Object sCreationLock = new Object();
- private static DeviceIdleJobsController sController;
-
/**
* These are jobs added with a special flag to indicate that they should be exempted from doze
* when the app is temp whitelisted or in the foreground.
@@ -69,7 +65,6 @@
private final SparseBooleanArray mForegroundUids;
private final DeviceIdleUpdateFunctor mDeviceIdleUpdateFunctor;
private final DeviceIdleJobsDelayHandler mHandler;
- private final JobSchedulerService mJobSchedulerService;
private final PowerManager mPowerManager;
private final DeviceIdleController.LocalService mLocalDeviceIdleController;
@@ -80,19 +75,6 @@
private int[] mDeviceIdleWhitelistAppIds;
private int[] mPowerSaveTempWhitelistAppIds;
- /**
- * Returns a singleton for the DeviceIdleJobsController
- */
- public static DeviceIdleJobsController get(JobSchedulerService service) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new DeviceIdleJobsController(service, service.getContext(),
- service.getLock());
- }
- return sController;
- }
- }
-
// onReceive
private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@Override
@@ -134,12 +116,10 @@
}
};
- private DeviceIdleJobsController(JobSchedulerService jobSchedulerService, Context context,
- Object lock) {
- super(jobSchedulerService, context, lock);
+ public DeviceIdleJobsController(JobSchedulerService service) {
+ super(service);
- mJobSchedulerService = jobSchedulerService;
- mHandler = new DeviceIdleJobsDelayHandler(context.getMainLooper());
+ mHandler = new DeviceIdleJobsDelayHandler(mContext.getMainLooper());
// Register for device idle mode changes
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
mLocalDeviceIdleController =
@@ -169,13 +149,13 @@
if (DEBUG) Slog.d(TAG, "mDeviceIdleMode=" + mDeviceIdleMode);
if (enabled) {
mHandler.removeMessages(PROCESS_BACKGROUND_JOBS);
- mJobSchedulerService.getJobStore().forEachJob(mDeviceIdleUpdateFunctor);
+ mService.getJobStore().forEachJob(mDeviceIdleUpdateFunctor);
} else {
// When coming out of doze, process all foreground uids immediately, while others
// will be processed after a delay of 3 seconds.
for (int i = 0; i < mForegroundUids.size(); i++) {
if (mForegroundUids.valueAt(i)) {
- mJobSchedulerService.getJobStore().forEachJobForSourceUid(
+ mService.getJobStore().forEachJobForSourceUid(
mForegroundUids.keyAt(i), mDeviceIdleUpdateFunctor);
}
}
@@ -201,7 +181,7 @@
}
mForegroundUids.put(uid, active);
mDeviceIdleUpdateFunctor.mChanged = false;
- mJobSchedulerService.getJobStore().forEachJobForSourceUid(uid, mDeviceIdleUpdateFunctor);
+ mService.getJobStore().forEachJobForSourceUid(uid, mDeviceIdleUpdateFunctor);
if (mDeviceIdleUpdateFunctor.mChanged) {
mStateChangedListener.onControllerStateChanged();
}
@@ -253,7 +233,7 @@
pw.println("Idle mode: " + mDeviceIdleMode);
pw.println();
- mJobSchedulerService.getJobStore().forEachJob(predicate, (jobStatus) -> {
+ mService.getJobStore().forEachJob(predicate, (jobStatus) -> {
pw.print("#");
jobStatus.printUniqueId(pw);
pw.print(" from ");
@@ -281,7 +261,7 @@
proto.write(StateControllerProto.DeviceIdleJobsController.IS_DEVICE_IDLE_MODE,
mDeviceIdleMode);
- mJobSchedulerService.getJobStore().forEachJob(predicate, (jobStatus) -> {
+ mService.getJobStore().forEachJob(predicate, (jobStatus) -> {
final long jsToken =
proto.start(StateControllerProto.DeviceIdleJobsController.TRACKED_JOBS);
@@ -322,7 +302,7 @@
// Just process all the jobs, the ones in foreground should already be running.
synchronized (mLock) {
mDeviceIdleUpdateFunctor.mChanged = false;
- mJobSchedulerService.getJobStore().forEachJob(mDeviceIdleUpdateFunctor);
+ mService.getJobStore().forEachJob(mDeviceIdleUpdateFunctor);
if (mDeviceIdleUpdateFunctor.mChanged) {
mStateChangedListener.onControllerStateChanged();
}
diff --git a/services/core/java/com/android/server/job/controllers/IdleController.java b/services/core/java/com/android/server/job/controllers/IdleController.java
index 2cfa2c5..1dbcfd6 100644
--- a/services/core/java/com/android/server/job/controllers/IdleController.java
+++ b/services/core/java/com/android/server/job/controllers/IdleController.java
@@ -33,7 +33,6 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.am.ActivityManagerService;
import com.android.server.job.JobSchedulerService;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import java.util.function.Predicate;
@@ -50,22 +49,8 @@
final ArraySet<JobStatus> mTrackedTasks = new ArraySet<>();
IdlenessTracker mIdleTracker;
- // Singleton factory
- private static Object sCreationLock = new Object();
- private static volatile IdleController sController;
-
- public static IdleController get(JobSchedulerService service) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new IdleController(service, service.getContext(), service.getLock());
- }
- return sController;
- }
- }
-
- private IdleController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
+ public IdleController(JobSchedulerService service) {
+ super(service);
initIdleStateTracking();
}
diff --git a/services/core/java/com/android/server/job/controllers/StateController.java b/services/core/java/com/android/server/job/controllers/StateController.java
index 2b97bca..495109d 100644
--- a/services/core/java/com/android/server/job/controllers/StateController.java
+++ b/services/core/java/com/android/server/job/controllers/StateController.java
@@ -20,6 +20,8 @@
import android.util.proto.ProtoOutputStream;
import com.android.internal.util.IndentingPrintWriter;
+import com.android.server.job.JobSchedulerService;
+import com.android.server.job.JobSchedulerService.Constants;
import com.android.server.job.StateChangedListener;
import java.util.function.Predicate;
@@ -30,15 +32,18 @@
* are ready to run, or whether they must be stopped.
*/
public abstract class StateController {
+ protected final JobSchedulerService mService;
+ protected final StateChangedListener mStateChangedListener;
protected final Context mContext;
protected final Object mLock;
- protected final StateChangedListener mStateChangedListener;
+ protected final Constants mConstants;
- public StateController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- mStateChangedListener = stateChangedListener;
- mContext = context;
- mLock = lock;
+ StateController(JobSchedulerService service) {
+ mService = service;
+ mStateChangedListener = service;
+ mContext = service.getContext();
+ mLock = service.getLock();
+ mConstants = service.getConstants();
}
/**
diff --git a/services/core/java/com/android/server/job/controllers/StorageController.java b/services/core/java/com/android/server/job/controllers/StorageController.java
index e36f02d..c2ae53f 100644
--- a/services/core/java/com/android/server/job/controllers/StorageController.java
+++ b/services/core/java/com/android/server/job/controllers/StorageController.java
@@ -31,7 +31,6 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.job.JobSchedulerService;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import com.android.server.storage.DeviceStorageMonitorService;
@@ -45,36 +44,16 @@
private static final boolean DEBUG = JobSchedulerService.DEBUG
|| Log.isLoggable(TAG, Log.DEBUG);
- private static final Object sCreationLock = new Object();
- private static volatile StorageController sController;
-
private final ArraySet<JobStatus> mTrackedTasks = new ArraySet<JobStatus>();
- private StorageTracker mStorageTracker;
-
- public static StorageController get(JobSchedulerService taskManagerService) {
- synchronized (sCreationLock) {
- if (sController == null) {
- sController = new StorageController(taskManagerService,
- taskManagerService.getContext(), taskManagerService.getLock());
- }
- }
- return sController;
- }
+ private final StorageTracker mStorageTracker;
@VisibleForTesting
public StorageTracker getTracker() {
return mStorageTracker;
}
- @VisibleForTesting
- public static StorageController getForTesting(StateChangedListener stateChangedListener,
- Context context) {
- return new StorageController(stateChangedListener, context, new Object());
- }
-
- private StorageController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
+ public StorageController(JobSchedulerService service) {
+ super(service);
mStorageTracker = new StorageTracker();
mStorageTracker.startTracking();
}
diff --git a/services/core/java/com/android/server/job/controllers/TimeController.java b/services/core/java/com/android/server/job/controllers/TimeController.java
index 1b2292db..fa48b5e 100644
--- a/services/core/java/com/android/server/job/controllers/TimeController.java
+++ b/services/core/java/com/android/server/job/controllers/TimeController.java
@@ -32,7 +32,6 @@
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.job.JobSchedulerService;
-import com.android.server.job.StateChangedListener;
import com.android.server.job.StateControllerProto;
import java.util.Iterator;
@@ -63,23 +62,13 @@
private AlarmManager mAlarmService = null;
/** List of tracked jobs, sorted asc. by deadline */
private final List<JobStatus> mTrackedJobs = new LinkedList<>();
- /** Singleton. */
- private static TimeController mSingleton;
- public static synchronized TimeController get(JobSchedulerService jms) {
- if (mSingleton == null) {
- mSingleton = new TimeController(jms, jms.getContext(), jms.getLock());
- }
- return mSingleton;
- }
-
- private TimeController(StateChangedListener stateChangedListener, Context context,
- Object lock) {
- super(stateChangedListener, context, lock);
+ public TimeController(JobSchedulerService service) {
+ super(service);
mNextJobExpiredElapsedMillis = Long.MAX_VALUE;
mNextDelayExpiredElapsedMillis = Long.MAX_VALUE;
- mChainedAttributionEnabled = WorkSource.isChainedBatteryAttributionEnabled(context);
+ mChainedAttributionEnabled = WorkSource.isChainedBatteryAttributionEnabled(mContext);
}
/**
diff --git a/services/tests/servicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java b/services/tests/servicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java
index 35cba18..8874894 100644
--- a/services/tests/servicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java
+++ b/services/tests/servicestests/src/com/android/server/job/controllers/ConnectivityControllerTest.java
@@ -33,12 +33,14 @@
import android.net.Network;
import android.net.NetworkCapabilities;
import android.os.Build;
+import android.os.Handler;
import android.os.SystemClock;
import android.support.test.runner.AndroidJUnit4;
import android.util.DataUnit;
import com.android.server.LocalServices;
import com.android.server.job.JobSchedulerService;
+import com.android.server.job.JobSchedulerService.Constants;
import org.junit.Before;
import org.junit.Test;
@@ -49,6 +51,8 @@
@RunWith(AndroidJUnit4.class)
public class ConnectivityControllerTest {
+ private Constants mConstants;
+
@Before
public void setUp() throws Exception {
// Assume all packages are current SDK
@@ -65,23 +69,26 @@
Clock.fixed(SystemClock.uptimeMillisClock().instant(), ZoneOffset.UTC);
JobSchedulerService.sElapsedRealtimeClock =
Clock.fixed(SystemClock.elapsedRealtimeClock().instant(), ZoneOffset.UTC);
+
+ // Assume default constants for now
+ mConstants = new Constants();
}
@Test
public void testInsane() throws Exception {
- final Network network = new Network(101);
+ final Network net = new Network(101);
final JobInfo.Builder job = createJob()
.setEstimatedNetworkBytes(DataUnit.MEBIBYTES.toBytes(1))
.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
// Slow network is too slow
- assertFalse(ConnectivityController.isSatisfied(createJobStatus(job), network,
+ assertFalse(ConnectivityController.isSatisfied(createJobStatus(job), net,
createCapabilities().setLinkUpstreamBandwidthKbps(1)
- .setLinkDownstreamBandwidthKbps(1)));
+ .setLinkDownstreamBandwidthKbps(1), mConstants));
// Fast network looks great
- assertTrue(ConnectivityController.isSatisfied(createJobStatus(job), network,
+ assertTrue(ConnectivityController.isSatisfied(createJobStatus(job), net,
createCapabilities().setLinkUpstreamBandwidthKbps(1024)
- .setLinkDownstreamBandwidthKbps(1024)));
+ .setLinkDownstreamBandwidthKbps(1024), mConstants));
}
@Test
@@ -95,19 +102,19 @@
// Uncongested network is whenever
{
- final Network network = new Network(101);
- final NetworkCapabilities capabilities = createCapabilities()
+ final Network net = new Network(101);
+ final NetworkCapabilities caps = createCapabilities()
.addCapability(NET_CAPABILITY_NOT_CONGESTED);
- assertTrue(ConnectivityController.isSatisfied(early, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(late, network, capabilities));
+ assertTrue(ConnectivityController.isSatisfied(early, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(late, net, caps, mConstants));
}
// Congested network is more selective
{
- final Network network = new Network(101);
- final NetworkCapabilities capabilities = createCapabilities();
- assertFalse(ConnectivityController.isSatisfied(early, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(late, network, capabilities));
+ final Network net = new Network(101);
+ final NetworkCapabilities caps = createCapabilities();
+ assertFalse(ConnectivityController.isSatisfied(early, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(late, net, caps, mConstants));
}
}
@@ -126,25 +133,25 @@
// Unmetered network is whenever
{
- final Network network = new Network(101);
- final NetworkCapabilities capabilities = createCapabilities()
+ final Network net = new Network(101);
+ final NetworkCapabilities caps = createCapabilities()
.addCapability(NET_CAPABILITY_NOT_CONGESTED)
.addCapability(NET_CAPABILITY_NOT_METERED);
- assertTrue(ConnectivityController.isSatisfied(early, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(late, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(earlyPrefetch, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(latePrefetch, network, capabilities));
+ assertTrue(ConnectivityController.isSatisfied(early, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(late, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(earlyPrefetch, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(latePrefetch, net, caps, mConstants));
}
// Metered network is only when prefetching and late
{
- final Network network = new Network(101);
- final NetworkCapabilities capabilities = createCapabilities()
+ final Network net = new Network(101);
+ final NetworkCapabilities caps = createCapabilities()
.addCapability(NET_CAPABILITY_NOT_CONGESTED);
- assertFalse(ConnectivityController.isSatisfied(early, network, capabilities));
- assertFalse(ConnectivityController.isSatisfied(late, network, capabilities));
- assertFalse(ConnectivityController.isSatisfied(earlyPrefetch, network, capabilities));
- assertTrue(ConnectivityController.isSatisfied(latePrefetch, network, capabilities));
+ assertFalse(ConnectivityController.isSatisfied(early, net, caps, mConstants));
+ assertFalse(ConnectivityController.isSatisfied(late, net, caps, mConstants));
+ assertFalse(ConnectivityController.isSatisfied(earlyPrefetch, net, caps, mConstants));
+ assertTrue(ConnectivityController.isSatisfied(latePrefetch, net, caps, mConstants));
}
}