commit 347c2780aab9dbacb7e0336d3585890647187bf4
author Shreyas Basarge <snb@google.com> Fri Jan 15 18:24:36 2016 +0000
committer Shreyas Basarge <snb@google.com> Fri Jan 15 18:24:36 2016 +0000
tree 63c36b9b2f382f13b36f1cd4f8cc9eb113ef821b
parent 4bfa55d4c232d2c55b5ffabd2e1ec856d4ef5a89

Fix for possible NPE in JobScheduler

Fixes a possible NPE in JobScheduler

Change-Id: I4faa414ea92ab65326001f83de4624834b5ed955

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

diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index a6db613..e5a3264 100644
--- a/services/core/java/com/android/server/job/JobSchedulerService.java
+++ b/services/core/java/com/android/server/job/JobSchedulerService.java
@@ -905,6 +905,11 @@
                     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;
                 }