Merge "Fix for possible NPE in JobScheduler"

2016-01-19 11:46:37 +00:00
parent 365bd8f9b1 347c2780aa
commit 3dbb412c94
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -913,6 +913,11 @@ public class JobSchedulerService extends com.android.server.SystemService
                    minPriorityContextId = i;
                    break;
                }
+                if (job == null) {
+                    // No job on this context, but nextPending can't run here because
+                    // the context has a preferred Uid.
+                    continue;
+                }
                if (job.getUid() != nextPending.getUid()) {
                    continue;
                }