diff options
| author | Svetoslav <svetoslavganov@google.com> | 2013-11-05 14:22:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-05 14:22:45 -0800 |
| commit | 8045a50ed1902ff4007be7cd35b43188a61cafb0 (patch) | |
| tree | 9412f8ac0f45306420cf5abeee8de4f38f4d470c /packages/PrintSpooler | |
| parent | b066a136d72e753836be17a73f25826605b8a92f (diff) | |
| parent | 05d15b36bf133ac06c93e181c922d8119561ad5f (diff) | |
| download | frameworks_base-8045a50ed1902ff4007be7cd35b43188a61cafb0.zip frameworks_base-8045a50ed1902ff4007be7cd35b43188a61cafb0.tar.gz frameworks_base-8045a50ed1902ff4007be7cd35b43188a61cafb0.tar.bz2 | |
am 05d15b36: am 3976afb5: am c445b3f2: Merge "Add missing null pointer check in PrintSpoolerService." into klp-dev
* commit '05d15b36bf133ac06c93e181c922d8119561ad5f':
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; } |