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

Commit 8c6471d3 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Automerger Merge Worker
Browse files

Merge "Adding in code for logging job start latency into proto" into udc-dev am: 1292bb44 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21529520



Change-Id: If6623ffae16fa59b785f20ffe82e49807d12e2fe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4872ec48 1292bb44

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

+4 −2
Original line number Diff line number Diff line
@@ -1476,7 +1476,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    /* timingDelayConstraintSatisfied */ false,

                    /* isDeviceIdle */ false,

                    /* hasConnectivityConstraintSatisfied */ false,

                    /* hasContentTriggerConstraintSatisfied */ false);

                    /* hasContentTriggerConstraintSatisfied */ false,

                    0);



            // 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
@@ -1894,7 +1895,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_TIMING_DELAY),

                    cancelled.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),

                    cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),

                    cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER));

                    cancelled.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),

                    0);

        }

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

+4 −2
Original line number Diff line number Diff line
@@ -461,7 +461,8 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_TIMING_DELAY),

                    job.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),

                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),

                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER));

                    job.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),

                    mExecutionStartTimeElapsed - job.enqueueTime);

            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.
@@ -1356,7 +1357,8 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_TIMING_DELAY),

                completedJob.isConstraintSatisfied(JobInfo.CONSTRAINT_FLAG_DEVICE_IDLE),

                completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONNECTIVITY),

                completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER));

                completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER),

                0);

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

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

                    getId());