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

Commit 94d00b16 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "JobScheduler: cleanup async traces"

parents 8d6f5424 fc233ca0

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

+10 −4
Original line number Original line Diff line number Diff line
@@ -364,9 +364,12 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.getJob().getPriority(),

                    job.getJob().getPriority(),

                    job.getEffectivePriority(),

                    job.getEffectivePriority(),

                    job.getNumFailures());

                    job.getNumFailures());

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

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

            // per context.

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

            Trace.asyncTraceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, job.getTag(), getId());

                // running per context.

                Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",

                        job.getTag(), getId());

            }

            try {

            try {

                mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());

                mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());

            } catch (RemoteException e) {

            } catch (RemoteException e) {
@@ -1030,7 +1033,10 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.getJob().getPriority(),

                completedJob.getJob().getPriority(),

                completedJob.getEffectivePriority(),

                completedJob.getEffectivePriority(),

                completedJob.getNumFailures());

                completedJob.getNumFailures());

        Trace.asyncTraceEnd(Trace.TRACE_TAG_SYSTEM_SERVER, completedJob.getTag(), getId());

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

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

                    completedJob.getTag(), getId());

        }

        try {

        try {

            mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(),

            mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(),

                    internalStopReason);

                    internalStopReason);