Merge "Change trace tag." into udc-dev
This commit is contained in:
@@ -465,22 +465,36 @@ public final class JobServiceContext implements ServiceConnection {
|
|||||||
mExecutionStartTimeElapsed - job.enqueueTime,
|
mExecutionStartTimeElapsed - job.enqueueTime,
|
||||||
job.getJob().isUserInitiated(),
|
job.getJob().isUserInitiated(),
|
||||||
job.shouldTreatAsUserInitiatedJob());
|
job.shouldTreatAsUserInitiatedJob());
|
||||||
|
final String sourcePackage = job.getSourcePackageName();
|
||||||
if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
|
if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
|
||||||
|
final String componentPackage = job.getServiceComponent().getPackageName();
|
||||||
|
String traceTag = "*job*<" + job.getSourceUid() + ">" + sourcePackage;
|
||||||
|
if (!sourcePackage.equals(componentPackage)) {
|
||||||
|
traceTag += ":" + componentPackage;
|
||||||
|
}
|
||||||
|
traceTag += "/" + job.getServiceComponent().getShortClassName();
|
||||||
|
if (!componentPackage.equals(job.serviceProcessName)) {
|
||||||
|
traceTag += "$" + job.serviceProcessName;
|
||||||
|
}
|
||||||
|
if (job.getNamespace() != null) {
|
||||||
|
traceTag += "@" + job.getNamespace();
|
||||||
|
}
|
||||||
|
traceTag += "#" + job.getJobId();
|
||||||
|
|
||||||
// Use the context's ID to distinguish traces since there'll only be one job
|
// Use the context's ID to distinguish traces since there'll only be one job
|
||||||
// running per context.
|
// running per context.
|
||||||
Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",
|
Trace.asyncTraceForTrackBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler",
|
||||||
job.getTag(), getId());
|
traceTag, getId());
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());
|
mBatteryStats.noteJobStart(job.getBatteryName(), job.getSourceUid());
|
||||||
} catch (RemoteException e) {
|
} catch (RemoteException e) {
|
||||||
// Whatever.
|
// Whatever.
|
||||||
}
|
}
|
||||||
final String jobPackage = job.getSourcePackageName();
|
|
||||||
final int jobUserId = job.getSourceUserId();
|
final int jobUserId = job.getSourceUserId();
|
||||||
UsageStatsManagerInternal usageStats =
|
UsageStatsManagerInternal usageStats =
|
||||||
LocalServices.getService(UsageStatsManagerInternal.class);
|
LocalServices.getService(UsageStatsManagerInternal.class);
|
||||||
usageStats.setLastJobRunTime(jobPackage, jobUserId, mExecutionStartTimeElapsed);
|
usageStats.setLastJobRunTime(sourcePackage, jobUserId, mExecutionStartTimeElapsed);
|
||||||
mAvailable = false;
|
mAvailable = false;
|
||||||
mStoppedReason = null;
|
mStoppedReason = null;
|
||||||
mStoppedTime = 0;
|
mStoppedTime = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user