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

Merge "Fix for JobScheduler jobs not running" into nyc-dev

Browse Source
This commit is contained in:
Shreyas Basarge
2016-03-16 00:20:51 +00:00
committed by Android (Google) Code Review
parent e49ede4ed4 0529dac587
commit 833c312ea4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/job/controllers/ConnectivityController.java
View File

@@ -185,7 +185,7 @@ public class ConnectivityController extends StateController implements
pw.println("Conn."); pw.println("Conn.");
pw.println("connected: " + mNetworkConnected + " unmetered: " + mNetworkUnmetered); pw.println("connected: " + mNetworkConnected + " unmetered: " + mNetworkUnmetered);
for (JobStatus js: mTrackedJobs) { for (JobStatus js: mTrackedJobs) {
pw.println(String.valueOf(js.hashCode()).substring(0, 3) + ".." pw.println(String.valueOf(js.getJobId() + "," + js.getUid())
+ ": C=" + js.hasConnectivityConstraint() + ": C=" + js.hasConnectivityConstraint()
+ ", UM=" + js.hasUnmeteredConstraint()); + ", UM=" + js.hasUnmeteredConstraint());
} }

2
services/core/java/com/android/server/job/controllers/IdleController.java
View File

@@ -197,7 +197,7 @@ public class IdleController extends StateController {
for (int i = 0; i < mTrackedTasks.size(); i++) { for (int i = 0; i < mTrackedTasks.size(); i++) {
final JobStatus js = mTrackedTasks.get(i); final JobStatus js = mTrackedTasks.get(i);
pw.print(" "); pw.print(" ");
pw.print(String.valueOf(js.hashCode()).substring(0, 3)); pw.print(String.valueOf(js.getJobId() + "," + js.getUid()));
pw.println(".."); pw.println("..");
} }
} }

5
services/core/java/com/android/server/job/controllers/TimeController.java
View File

@@ -145,6 +145,9 @@ public class TimeController extends StateController {
final long jobDeadline = job.getLatestRunTimeElapsed(); final long jobDeadline = job.getLatestRunTimeElapsed();
if (jobDeadline <= nowElapsedMillis) { if (jobDeadline <= nowElapsedMillis) {
if (job.hasTimingDelayConstraint()) {
job.setTimingDelayConstraintSatisfied(true);
}
job.setDeadlineConstraintSatisfied(true); job.setDeadlineConstraintSatisfied(true);
mStateChangedListener.onRunJobNow(job); mStateChangedListener.onRunJobNow(job);
it.remove(); it.remove();
@@ -281,7 +284,7 @@ public class TimeController extends StateController {
+ "s"); + "s");
pw.println("Tracking:"); pw.println("Tracking:");
for (JobStatus ts : mTrackedJobs) { for (JobStatus ts : mTrackedJobs) {
pw.println(String.valueOf(ts.hashCode()).substring(0, 3) + ".." pw.println(String.valueOf(ts.getJobId() + "," + ts.getUid())
+ ": (" + (ts.hasTimingDelayConstraint() ? ts.getEarliestRunTime() : "N/A") + ": (" + (ts.hasTimingDelayConstraint() ? ts.getEarliestRunTime() : "N/A")
+ ", " + (ts.hasDeadlineConstraint() ?ts.getLatestRunTimeElapsed() : "N/A") + ", " + (ts.hasDeadlineConstraint() ?ts.getLatestRunTimeElapsed() : "N/A")
+ ")"); + ")");