From 347c2780aab9dbacb7e0336d3585890647187bf4 Mon Sep 17 00:00:00 2001
From: Shreyas Basarge <snb@google.com>
Date: Fri, 15 Jan 2016 18:24:36 +0000
Subject: [PATCH] Fix for possible NPE in JobScheduler

Fixes a possible NPE in JobScheduler

Change-Id: I4faa414ea92ab65326001f83de4624834b5ed955
---
 services/core/java/com/android/server/job/JobSchedulerService.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java
index a6db6137e54c..e5a32648ea75 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 @@ 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;
                 }
-- 
2.11.0