Merge "Log additional data to statsd." into udc-dev (d6e2ea0a) · Commits · e / os / android_frameworks_base

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

+18 −8

Original line number	Diff line number	Diff line
		@@ -1551,16 +1551,21 @@ public class JobSchedulerService extends com.android.server.SystemService
		jobStatus.getNumPreviousAttempts(),
		jobStatus.getJob().getMaxExecutionDelayMillis(),
		/* isDeadlineConstraintSatisfied */ false,
		/* isCharging */ false,
		/* batteryNotLow */ false,
		/* storageNotLow */false,
		/* isChargingSatisfied */ false,
		/* batteryNotLowSatisfied */ false,
		/* storageNotLowSatisfied */false,
		/* timingDelayConstraintSatisfied */ false,
		/* isDeviceIdle */ false,
		/* isDeviceIdleSatisfied */ false,
		/* hasConnectivityConstraintSatisfied */ false,
		/* hasContentTriggerConstraintSatisfied */ false,
		0,
		/* jobStartLatencyMs */ 0,
		jobStatus.getJob().isUserInitiated(),
		/* isRunningAsUserInitiatedJob */ false);
		/* isRunningAsUserInitiatedJob */ false,
		jobStatus.getJob().isPeriodic(),
		jobStatus.getJob().getMinLatencyMillis(),
		jobStatus.getEstimatedNetworkDownloadBytes(),
		jobStatus.getEstimatedNetworkUploadBytes(),
		jobStatus.getWorkCount());

		// If the job is immediately ready to run, then we can just immediately
		// put it in the pending list and try to schedule it. This is especially
		@@ -1981,9 +1986,14 @@ public class JobSchedulerService extends com.android.server.SystemService
		cancelled.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),
		cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),
		cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),
		0,
		/* jobStartLatencyMs */ 0,
		cancelled.getJob().isUserInitiated(),
		/* isRunningAsUserInitiatedJob */ false);
		/* isRunningAsUserInitiatedJob */ false,
		cancelled.getJob().isPeriodic(),
		cancelled.getJob().getMinLatencyMillis(),
		cancelled.getEstimatedNetworkDownloadBytes(),
		cancelled.getEstimatedNetworkUploadBytes(),
		cancelled.getWorkCount());
		}
		// If this is a replacement, bring in the new version of the job
		if (incomingJob != null) {

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -471,7 +471,12 @@ public final class JobServiceContext implements ServiceConnection {
		job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),
		mExecutionStartTimeElapsed - job.enqueueTime,
		job.getJob().isUserInitiated(),
		job.shouldTreatAsUserInitiatedJob());
		job.shouldTreatAsUserInitiatedJob(),
		job.getJob().isPeriodic(),
		job.getJob().getMinLatencyMillis(),
		job.getEstimatedNetworkDownloadBytes(),
		job.getEstimatedNetworkUploadBytes(),
		job.getWorkCount());
		final String sourcePackage = job.getSourcePackageName();
		if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
		final String componentPackage = job.getServiceComponent().getPackageName();
		@@ -1435,9 +1440,14 @@ public final class JobServiceContext implements ServiceConnection {
		completedJob.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),
		completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),
		completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),
		0,
		mExecutionStartTimeElapsed - completedJob.enqueueTime,
		completedJob.getJob().isUserInitiated(),
		completedJob.startedAsUserInitiatedJob);
		completedJob.startedAsUserInitiatedJob,
		completedJob.getJob().isPeriodic(),
		completedJob.getJob().getMinLatencyMillis(),
		completedJob.getEstimatedNetworkDownloadBytes(),
		completedJob.getEstimatedNetworkUploadBytes(),
		completedJob.getWorkCount());
		if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
		Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",
		getId());