Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"

am: 23b144eb40 Change-Id: Ifce8f15e876694a35c0e0a31b05d8ea47c462628
2019-01-28 21:50:20 -08:00
parent 1b607c875f 23b144eb40
commit 0e3645d84b
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -1596,6 +1596,7 @@ public class JobSchedulerService extends com.android.server.SystemService
                        }
                    } break;
                    case MSG_CHECK_JOB:
+                        removeMessages(MSG_CHECK_JOB);
                        if (mReportedActive) {
                            // if jobs are currently being run, queue all ready jobs for execution.
                            queueReadyJobsForExecutionLocked();
@@ -1652,7 +1653,6 @@ public class JobSchedulerService extends com.android.server.SystemService
                }
                maybeRunPendingJobsLocked();
                // Don't remove JOB_EXPIRED in case one came along while processing the queue.
-                removeMessages(MSG_CHECK_JOB);
            }
        }
    }