commit c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4
author Svetoslav <svetoslavganov@google.com> Tue Nov 05 03:33:36 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 05 03:33:37 2013 +0000
tree 2847e7e19aedc7aa6f3eb46c3fd1f704da7f42d6
parent 4033c94bb7566a652442ae1fa164d1efa7562761
parent 75d28505c8f73a977cc7ae0cc08a60120f7c92b2

Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev

packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
index 609ae64..778fb4d 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
@@ -544,7 +544,7 @@
         final int printJobCount = mPrintJobs.size();
         for (int i = 0; i < printJobCount; i++) {
             PrintJobInfo printJob = mPrintJobs.get(i);
-            if (isActiveState(printJob.getState())
+            if (isActiveState(printJob.getState()) && printJob.getPrinterId() != null
                     && printJob.getPrinterId().getServiceName().equals(service)) {
                 return true;
             }