Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcb51b82 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "ApprovedServices might be null, handle the case:"

parents 42007e34 0d1e6220

packages/PrintSpooler/src/com/android/printspooler/util/ApprovedPrintServices.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,11 @@ public class ApprovedPrintServices { 
    public void pruneApprovedServices(List<ComponentName> serviceNamesToKeep) {

    public void pruneApprovedServices(List<ComponentName> serviceNamesToKeep) {

        synchronized (sLock) {

        synchronized (sLock) {

            Set<String> approvedServices = getApprovedServices();

            Set<String> approvedServices = getApprovedServices();



            if (approvedServices == null) {

                return;

            }



            Set<String> newApprovedServices = new ArraySet<>(approvedServices.size());

            Set<String> newApprovedServices = new ArraySet<>(approvedServices.size());





            final int numServiceNamesToKeep = serviceNamesToKeep.size();

            final int numServiceNamesToKeep = serviceNamesToKeep.size();