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

* commit 'c6afd813ac2ddaa576fc7866479e933627622248': PackageManager#queryIntentServices breaks its contract.
2013-09-26 14:14:51 -07:00
parent 342daca7d7 c6afd813ac
commit ef7242326a
1 changed files with 4 additions and 0 deletions
--- a/services/java/com/android/server/print/PrintManagerService.java
+++ b/services/java/com/android/server/print/PrintManagerService.java
@@ -448,6 +448,10 @@ public final class PrintManagerService extends IPrintManager.Stub {
                        .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;