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

Commit 2942f9a4 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Android (Google) Code Review
Browse files

Merge "Adding in proc_state to jobs atom" into udc-dev

parents db1fc455 9fe48e93

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

+5 −2
Original line number Diff line number Diff line
@@ -1560,7 +1560,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    jobStatus.getJob().getMinLatencyMillis(),

                    jobStatus.getEstimatedNetworkDownloadBytes(),

                    jobStatus.getEstimatedNetworkUploadBytes(),

                    jobStatus.getWorkCount());

                    jobStatus.getWorkCount(),

                    ActivityManager.processStateAmToProto(mUidProcStates.get(jobStatus.getUid())));



            // 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
@@ -1935,6 +1936,7 @@ public class JobSchedulerService extends com.android.server.SystemService 
     * {@code incomingJob} is non-null, it replaces {@code cancelled} in the store of

     * currently scheduled jobs.

     */

    @GuardedBy("mLock")

    private void cancelJobImplLocked(JobStatus cancelled, JobStatus incomingJob,

            @JobParameters.StopReason int reason, int internalReasonCode, String debugReason) {

        if (DEBUG) Slog.d(TAG, "CANCEL: " + cancelled.toShortString());
@@ -1986,7 +1988,8 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    cancelled.getJob().getMinLatencyMillis(),

                    cancelled.getEstimatedNetworkDownloadBytes(),

                    cancelled.getEstimatedNetworkUploadBytes(),

                    cancelled.getWorkCount());

                    cancelled.getWorkCount(),

                    ActivityManager.processStateAmToProto(mUidProcStates.get(cancelled.getUid())));

        }

        // 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
@@ -25,6 +25,7 @@ import android.Manifest; 
import android.annotation.BytesLong;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.ActivityManager;

import android.app.ActivityManagerInternal;

import android.app.Notification;

import android.app.compat.CompatChanges;
@@ -476,7 +477,8 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.getJob().getMinLatencyMillis(),

                    job.getEstimatedNetworkDownloadBytes(),

                    job.getEstimatedNetworkUploadBytes(),

                    job.getWorkCount());

                    job.getWorkCount(),

                    ActivityManager.processStateAmToProto(mService.getUidProcState(job.getUid())));

            final String sourcePackage = job.getSourcePackageName();

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

                final String componentPackage = job.getServiceComponent().getPackageName();
@@ -1447,7 +1449,9 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.getJob().getMinLatencyMillis(),

                completedJob.getEstimatedNetworkDownloadBytes(),

                completedJob.getEstimatedNetworkUploadBytes(),

                completedJob.getWorkCount());

                completedJob.getWorkCount(),

                ActivityManager

                        .processStateAmToProto(mService.getUidProcState(completedJob.getUid())));

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

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

                    getId());