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

Commit 2996824c authored by Sanath Kumar's avatar Sanath Kumar Committed by Android (Google) Code Review
Browse files

Merge "Track periodic and flex intervals in ScheduledJobStateChanged events" into main

parents e3e57d95 4d427987

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

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

                    /* system_measured_source_upload_bytes */ 0,

                    /* system_measured_calling_download_bytes */0,

                    /* system_measured_calling_upload_bytes */ 0);

                    /* system_measured_calling_upload_bytes */ 0,

                    jobStatus.getJob().getIntervalMillis(),

                    jobStatus.getJob().getFlexMillis());



            // 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
@@ -2269,7 +2271,9 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    /* system_measured_source_download_bytes */ 0,

                    /* system_measured_source_upload_bytes */ 0,

                    /* system_measured_calling_download_bytes */0,

                    /* system_measured_calling_upload_bytes */ 0);

                    /* system_measured_calling_upload_bytes */ 0,

                    cancelled.getJob().getIntervalMillis(),

                    cancelled.getJob().getFlexMillis());

        }

        // 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
@@ -534,7 +534,9 @@ public final class JobServiceContext implements ServiceConnection { 
                    /* system_measured_source_download_bytes */ 0,

                    /* system_measured_source_upload_bytes */ 0,

                    /* system_measured_calling_download_bytes */ 0,

                    /* system_measured_calling_upload_bytes */ 0);

                    /* system_measured_calling_upload_bytes */ 0,

                    job.getJob().getIntervalMillis(),

                    job.getJob().getFlexMillis());

            sEnqueuedJwiAtJobStart.logSampleWithUid(job.getUid(), job.getWorkCount());

            final String sourcePackage = job.getSourcePackageName();

            if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
@@ -1616,7 +1618,9 @@ public final class JobServiceContext implements ServiceConnection { 
                TrafficStats.getUidRxBytes(completedJob.getUid())

                        - mInitialDownloadedBytesFromCalling,

                TrafficStats.getUidTxBytes(completedJob.getUid())

                        - mInitialUploadedBytesFromCalling);

                        - mInitialUploadedBytesFromCalling,

                completedJob.getJob().getIntervalMillis(),

                completedJob.getJob().getFlexMillis());

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

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

                    getId());