Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f054b33f authored by Shreyas Basarge's avatar Shreyas Basarge Committed by android-build-merger
Browse files

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

am: 833c312e

* commit '833c312e':
  Fix for JobScheduler jobs not running
parents ed3a2ff1 833c312e

services/core/java/com/android/server/job/controllers/ConnectivityController.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class ConnectivityController extends StateController implements 
        pw.println("Conn.");

        pw.println("connected: " + mNetworkConnected + " unmetered: " + mNetworkUnmetered);

        for (JobStatus js: mTrackedJobs) {

            pw.println(String.valueOf(js.hashCode()).substring(0, 3) + ".."

            pw.println(String.valueOf(js.getJobId() + "," + js.getUid())

                    + ": C=" + js.hasConnectivityConstraint()

                    + ", UM=" + js.hasUnmeteredConstraint());

        }

services/core/java/com/android/server/job/controllers/IdleController.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class IdleController extends StateController { 
        for (int i = 0; i < mTrackedTasks.size(); i++) {

            final JobStatus js = mTrackedTasks.get(i);

            pw.print("  ");

            pw.print(String.valueOf(js.hashCode()).substring(0, 3));

            pw.print(String.valueOf(js.getJobId() + "," + js.getUid()));

            pw.println("..");

        }

    }

services/core/java/com/android/server/job/controllers/TimeController.java

+4 −1
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ public class TimeController extends StateController { 
                final long jobDeadline = job.getLatestRunTimeElapsed();



                if (jobDeadline <= nowElapsedMillis) {

                    if (job.hasTimingDelayConstraint()) {

                        job.setTimingDelayConstraintSatisfied(true);

                    }

                    job.setDeadlineConstraintSatisfied(true);

                    mStateChangedListener.onRunJobNow(job);

                    it.remove();
@@ -281,7 +284,7 @@ public class TimeController extends StateController { 
                + "s");

        pw.println("Tracking:");

        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.hasDeadlineConstraint() ?ts.getLatestRunTimeElapsed() : "N/A")

                    + ")");