commit c6afd813ac2ddaa576fc7866479e933627622248
author Svetoslav Ganov <svetoslavganov@google.com> Thu Sep 26 21:10:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 26 21:10:19 2013 +0000
tree c8ecb131d8260f3681cd72c87801314d94d092ef
parent 2c854022bf7fb6d626b0e86dc0c16372774f2432
parent cb247866acf10b039e02b600f8471b4a508f0ce8

Merge "PackageManager#queryIntentServices breaks its contract." into klp-dev

services/java/com/android/server/print/PrintManagerService.java

diff --git a/services/java/com/android/server/print/PrintManagerService.java b/services/java/com/android/server/print/PrintManagerService.java
index 625770c..d4583b5 100644
--- a/services/java/com/android/server/print/PrintManagerService.java
+++ b/services/java/com/android/server/print/PrintManagerService.java
@@ -448,6 +448,10 @@
                         .queryIntentServicesAsUser(intent, PackageManager.GET_SERVICES,
                                 getChangingUserId());
 
+                if (installedServices == null) {
+                    return;
+                }
+
                 final int installedServiceCount = installedServices.size();
                 for (int i = 0; i < installedServiceCount; i++) {
                     ServiceInfo serviceInfo = installedServices.get(i).serviceInfo;