From d5747a6d70b18f0ec75e682e6070aaddf98881c5 Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Mon, 8 Jan 2018 20:57:35 -0800 Subject: [PATCH] Atom: ScheduledJobStateChanged Rename the possible states in ScheduleJobStateChanged from ON and OFF to SCHEDULED, STARTED, and FINISHED. Added the log line in JobSchedulerService for SCHEDULE. STARTED corresponds to what previously was the ON event. FINISHED corresponds to what previously was the OFF event. Test: accompanying CTS test Change-Id: I779dd58092e8fdee58561b8e8e74be5404f3ed93 --- cmds/statsd/src/atoms.proto | 5 +++-- .../java/com/android/server/job/JobSchedulerService.java | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 4a7f0c4b65454..cc98b98290625 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -322,8 +322,9 @@ message ScheduledJobStateChanged { optional string name = 2; enum State { - OFF = 0; - ON = 1; + FINISHED = 0; + STARTED = 1; + SCHEDULED = 2; } optional State state = 3; diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index bd1dbf9c46e84..fa5fdf587b8d1 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -63,6 +63,7 @@ import android.util.KeyValueListParser; import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; +import android.util.StatsLog; import android.util.TimeUtils; import android.util.proto.ProtoOutputStream; @@ -823,6 +824,8 @@ public final class JobSchedulerService extends com.android.server.SystemService jobStatus.enqueueWorkLocked(ActivityManager.getService(), work); } startTrackingJobLocked(jobStatus, toCancel); + StatsLog.write_non_chained(StatsLog.SCHEDULED_JOB_STATE_CHANGED, + uId, null, jobStatus.getBatteryName(), 2); // 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