From 528424c26cb118a68f77cef94992a0282cfdc12c Mon Sep 17 00:00:00 2001 From: Svetoslav Date: Fri, 26 Sep 2014 19:11:29 -0700 Subject: Fix carsh in print spooler if custom print setings return bad pages. The custom settings activity of a print serivce can change the selected pages and the spooler was not checking whether the returned pages were valid leading to a crash. bug:17678553 Change-Id: Id8ea3d482d2909b97a06752d61b416dfe5948483 --- .../com/android/printspooler/ui/PrintActivity.java | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index aa42c75..72916ea 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -724,10 +724,35 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } } + // Handle selected page changes making sure they are in the doc. PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info; final int pageCount = (info != null) ? getAdjustedPageCount(info) : 0; PageRange[] pageRanges = printJobInfo.getPages(); - updateSelectedPages(pageRanges, pageCount); + if (pageRanges != null && pageCount > 0) { + pageRanges = PageRangeUtils.normalize(pageRanges); + + List validatedList = new ArrayList<>(); + final int rangeCount = pageRanges.length; + for (int i = 0; i < rangeCount; i++) { + PageRange pageRange = pageRanges[i]; + if (pageRange.getEnd() >= pageCount) { + final int rangeStart = pageRange.getStart(); + final int rangeEnd = pageCount - 1; + if (rangeStart <= rangeEnd) { + pageRange = new PageRange(rangeStart, rangeEnd); + validatedList.add(pageRange); + } + break; + } + validatedList.add(pageRange); + } + + if (!validatedList.isEmpty()) { + PageRange[] validatedArray = new PageRange[validatedList.size()]; + validatedList.toArray(validatedArray); + updateSelectedPages(validatedArray, pageCount); + } + } // Update the content if needed. if (canUpdateDocument()) { -- cgit v1.1