diff --git a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java index ce7da86074975..b89337f8fd4ec 100644 --- a/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java +++ b/apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java @@ -1193,7 +1193,7 @@ public final class JobServiceContext implements ServiceConnection { completedJob.isConstraintSatisfied(JobStatus.CONSTRAINT_CONTENT_TRIGGER)); if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) { Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_SYSTEM_SERVER, "JobScheduler", - completedJob.getTag(), getId()); + getId()); } try { mBatteryStats.noteJobFinish(mRunningJob.getBatteryName(), mRunningJob.getSourceUid(), diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index ad27b33835a38..e48539791cc13 100644 --- a/core/java/android/app/Service.java +++ b/core/java/android/app/Service.java @@ -1080,7 +1080,6 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac if (mForegroundServiceTraceTitle != null) { Trace.asyncTraceForTrackEnd(TRACE_TAG_ACTIVITY_MANAGER, TRACE_TRACK_NAME_FOREGROUND_SERVICE, - mForegroundServiceTraceTitle, System.identityHashCode(this)); mForegroundServiceTraceTitle = null; } diff --git a/core/java/android/os/Trace.java b/core/java/android/os/Trace.java index cdde18aed604b..adc73c882af0f 100644 --- a/core/java/android/os/Trace.java +++ b/core/java/android/os/Trace.java @@ -394,19 +394,6 @@ public final class Trace { } } - /** - * @deprecated use asyncTraceForTrackEnd without methodName argument - * - * @hide - */ - @Deprecated - public static void asyncTraceForTrackEnd(long traceTag, - @NonNull String trackName, @NonNull String methodName, int cookie) { - if (isTagEnabled(traceTag)) { - nativeAsyncTraceForTrackEnd(traceTag, trackName, cookie); - } - } - /** * Writes a trace message to indicate that a given section of code was invoked. *