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

2013-11-05 03:33:36 +00:00
parent 4033c94bb7 75d28505c8
commit c445b3f2cb
1 changed files with 1 additions and 1 deletions
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java
@@ -544,7 +544,7 @@ public final class PrintSpoolerService extends Service {
        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;
            }