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

Merge "Show "in parole?" in dumpsys jobscheduler" into pi-dev

Browse Source
This commit is contained in:
Makoto Onuki
2018-05-08 18:09:56 +00:00
committed by Android (Google) Code Review
parent 330dd0b244 0525b98b3a
commit c70d756bf6
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/proto/android/server/jobscheduler.proto
View File

@@ -40,6 +40,7 @@ message JobSchedulerServiceDumpProto {
repeated int32 next_heartbeat = 15; repeated int32 next_heartbeat = 15;
optional int64 last_heartbeat_time_millis = 16; optional int64 last_heartbeat_time_millis = 16;
optional int64 next_heartbeat_time_millis = 17; optional int64 next_heartbeat_time_millis = 17;
optional bool in_parole = 18;
repeated int32 started_users = 2; repeated int32 started_users = 2;

4
services/core/java/com/android/server/job/JobSchedulerService.java
View File

@@ -3036,6 +3036,9 @@ public class JobSchedulerService extends com.android.server.SystemService
TimeUtils.formatDuration(mLastHeartbeatTime + mConstants.STANDBY_HEARTBEAT_TIME, TimeUtils.formatDuration(mLastHeartbeatTime + mConstants.STANDBY_HEARTBEAT_TIME,
nowElapsed, pw); nowElapsed, pw);
pw.println(); pw.println();
pw.print(" In parole?: ");
pw.print(mInParole);
pw.println();
pw.println(); pw.println();
pw.println("Started users: " + Arrays.toString(mStartedUsers)); pw.println("Started users: " + Arrays.toString(mStartedUsers));
@@ -3210,6 +3213,7 @@ public class JobSchedulerService extends com.android.server.SystemService
mLastHeartbeatTime - nowUptime); mLastHeartbeatTime - nowUptime);
proto.write(JobSchedulerServiceDumpProto.NEXT_HEARTBEAT_TIME_MILLIS, proto.write(JobSchedulerServiceDumpProto.NEXT_HEARTBEAT_TIME_MILLIS,
mLastHeartbeatTime + mConstants.STANDBY_HEARTBEAT_TIME - nowUptime); mLastHeartbeatTime + mConstants.STANDBY_HEARTBEAT_TIME - nowUptime);
proto.write(JobSchedulerServiceDumpProto.IN_PAROLE, mInParole);
for (int u : mStartedUsers) { for (int u : mStartedUsers) {
proto.write(JobSchedulerServiceDumpProto.STARTED_USERS, u); proto.write(JobSchedulerServiceDumpProto.STARTED_USERS, u);