summaryrefslogtreecommitdiffstats
path: root/packages/PrintSpooler
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2013-11-05 03:33:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-05 03:33:37 +0000
commitc445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4 (patch)
tree2847e7e19aedc7aa6f3eb46c3fd1f704da7f42d6 /packages/PrintSpooler
parent4033c94bb7566a652442ae1fa164d1efa7562761 (diff)
parent75d28505c8f73a977cc7ae0cc08a60120f7c92b2 (diff)
downloadframeworks_base-c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4.zip
frameworks_base-c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4.tar.gz
frameworks_base-c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4.tar.bz2
Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev
Diffstat (limited to 'packages/PrintSpooler')
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java2
1 files changed, 1 insertions, 1 deletions
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 @@ 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;
}