commit 454c831d1d66e19eb282d0f99c7a682db4a9ae9d
author Chris Tate <ctate@android.com> Mon Dec 11 18:33:30 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 11 18:33:30 2017 +0000
tree c31bf487900bdfc2bc8a5207fbe9456e8fdf34bc
parent 1f397705eb58ccb7fd341144e98400a7bb5f3432
parent 41f3fe806951bea3ebbbf376e532fa67115ba9fd

Merge "Fix system crash in certain jobs-removed cases"

services/core/java/com/android/server/job/JobStore.java

diff --git a/services/core/java/com/android/server/job/JobStore.java b/services/core/java/com/android/server/job/JobStore.java
index 219bc61..36cacd7a 100644
--- a/services/core/java/com/android/server/job/JobStore.java
+++ b/services/core/java/com/android/server/job/JobStore.java
@@ -1149,8 +1149,10 @@
         public void forEachJob(JobStatusFunctor functor) {
             for (int uidIndex = mJobs.size() - 1; uidIndex >= 0; uidIndex--) {
                 ArraySet<JobStatus> jobs = mJobs.valueAt(uidIndex);
-                for (int i = jobs.size() - 1; i >= 0; i--) {
-                    functor.process(jobs.valueAt(i));
+                if (jobs != null) {
+                    for (int i = jobs.size() - 1; i >= 0; i--) {
+                        functor.process(jobs.valueAt(i));
+                    }
                 }
             }
         }