Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trace job execution.

Browse Source 
Also include the job ID in the battery name so that we can distinguish
between jobs using the same JobService.

Bug: 230864839
Test: N/A
Change-Id: Ia183329ef398b8a8fe9ef246a0f0592cd274a88f
(cherry pick of ag/18972117 and ag/19969125)
This commit is contained in:
Kweku Adams
2022-06-17 18:38:58 +00:00
committed by Simon MacMullen
parent 56cf35b281
commit 6c0d3e107f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java
View File

@@ -43,6 +43,7 @@ import android.os.Looper;
import android.os.Message;
import android.os.PowerManager;
import android.os.RemoteException;
import android.os.Trace;
import android.os.UserHandle;
import android.util.EventLog;
import android.util.IndentingPrintWriter;
@@ -361,6 +362,9 @@ public final class JobServiceContext implements ServiceConnection {
job.getJob().getPriority(),
job.getEffectivePriority(),
job.getNumFailures());
// Use the context's ID to distinguish traces since there'll only be one job running
// per context.
Trace.asyncTraceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, job.getTag(), getId());
try {
mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());
} catch (RemoteException e) {
@@ -1024,6 +1028,7 @@ public final class JobServiceContext implements ServiceConnection {
completedJob.getJob().getPriority(),
completedJob.getEffectivePriority(),
completedJob.getNumFailures());
Trace.asyncTraceEnd(Trace.TRACE_TAG_SYSTEM_SERVER, completedJob.getTag(), getId());
try {
mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(),
internalStopReason);

2
apex/jobscheduler/service/java/com/android/server/job/controllers/JobStatus.java
View File

@@ -496,7 +496,7 @@ public final class JobStatus {
this.batteryName = this.sourceTag != null
? this.sourceTag + ":" + job.getService().getPackageName()
: job.getService().flattenToShortString();
this.tag = "*job*/" + this.batteryName;
this.tag = "*job*/" + this.batteryName + "#" + job.getId();
this.earliestRunTimeElapsedMillis = earliestRunTimeElapsedMillis;
this.latestRunTimeElapsedMillis = latestRunTimeElapsedMillis;