am 3976afb5: am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev

* commit '3976afb5ac2036864f8d75c26e144c5761c6b20c':
  Add missing null pointer check in PrintSpoolerService.
This commit is contained in:
Svetoslav
2013-11-05 13:26:44 -08:00
committed by Android Git Automerger

View File

@@ -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;
}