diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-11-04 19:35:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-04 19:35:38 -0800 |
| commit | 3976afb5ac2036864f8d75c26e144c5761c6b20c (patch) | |
| tree | f8e3100734acc24f2f3ac3a2d2cf30357120d836 /packages/PrintSpooler | |
| parent | 628264c4f3828e0c4c997bb91f289a91d54c75c4 (diff) | |
| parent | c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4 (diff) | |
| download | frameworks_base-3976afb5ac2036864f8d75c26e144c5761c6b20c.zip frameworks_base-3976afb5ac2036864f8d75c26e144c5761c6b20c.tar.gz frameworks_base-3976afb5ac2036864f8d75c26e144c5761c6b20c.tar.bz2 | |
am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev
* commit 'c445b3f2cba67b7dbb8f926ef5e80ec14fb2f8d4':
Add missing null pointer check in PrintSpoolerService.
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java | 2 |
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; } |