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

Commit e739f730 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update metrics logging with new UIDT job fields." into udc-dev

parents 07e4e1b9 2a3a37ed

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

+6 −2
Original line number Diff line number Diff line
@@ -1488,7 +1488,9 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    /* isDeviceIdle */ false,

                    /* hasConnectivityConstraintSatisfied */ false,

                    /* hasContentTriggerConstraintSatisfied */ false,

                    0);

                    0,

                    jobStatus.getJob().isUserInitiated(),

                    /* isRunningAsUserInitiatedJob */ false);



            // 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
@@ -1907,7 +1909,9 @@ 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);

                    0,

                    cancelled.getJob().isUserInitiated(),

                    /* isRunningAsUserInitiatedJob */ false);

        }

        // 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

+6 −2
Original line number Diff line number Diff line
@@ -462,7 +462,9 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),

                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),

                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),

                    mExecutionStartTimeElapsed - job.enqueueTime);

                    mExecutionStartTimeElapsed - job.enqueueTime,

                    job.getJob().isUserInitiated(),

                    job.shouldTreatAsUserInitiatedJob());

            if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

                // Use the context's ID to distinguish traces since there'll only be one job

                // running per context.
@@ -1361,7 +1363,9 @@ 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);

                0,

                completedJob.getJob().isUserInitiated(),

                completedJob.startedAsUserInitiatedJob);

        if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

            Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",

                    getId());