From 0d1e622000820bf3d83419757929367ecb9f1fdd Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Fri, 8 Jan 2016 15:31:45 -0800 Subject: ApprovedServices might be null, handle the case: Bug: 26454066 Change-Id: I909d84d08a1f6d29f486e8ea6097e782b054864e --- .../src/com/android/printspooler/util/ApprovedPrintServices.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/PrintSpooler/src/com/android/printspooler/util/ApprovedPrintServices.java b/packages/PrintSpooler/src/com/android/printspooler/util/ApprovedPrintServices.java index a1e3ef430c9e..f78115906003 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/util/ApprovedPrintServices.java +++ b/packages/PrintSpooler/src/com/android/printspooler/util/ApprovedPrintServices.java @@ -134,6 +134,11 @@ public class ApprovedPrintServices { public void pruneApprovedServices(List serviceNamesToKeep) { synchronized (sLock) { Set approvedServices = getApprovedServices(); + + if (approvedServices == null) { + return; + } + Set newApprovedServices = new ArraySet<>(approvedServices.size()); final int numServiceNamesToKeep = serviceNamesToKeep.size(); -- cgit v1.2.3-59-g8ed1b