Merge "Fix NPE in PrintManagerService" into nyc-dev

1 files changed, 11 insertions, 9 deletions

diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
index a9ab1d74b614..42b4f64366ba 100644
--- a/services/print/java/com/android/server/print/PrintManagerService.java
+++ b/services/print/java/com/android/server/print/PrintManagerService.java
@@ -623,16 +623,18 @@ public final class PrintManagerService extends SystemService {
 
                         List<PrintServiceInfo> installedServices = userState
                                 .getPrintServices(PrintManager.ALL_SERVICES);
-                        final int numInstalledServices = installedServices.size();
-                        for (int i = 0; i < numInstalledServices; i++) {
-                            if (installedServices.get(i).getResolveInfo().serviceInfo.packageName
-                                    .equals(packageName)) {
-                                servicesChanged = true;
-                                break;
+                        if (installedServices != null) {
+                            final int numInstalledServices = installedServices.size();
+                            for (int i = 0; i < numInstalledServices; i++) {
+                                if (installedServices.get(i).getResolveInfo()
+                                        .serviceInfo.packageName.equals(packageName)) {
+                                    servicesChanged = true;
+                                    break;
+                                }
+                            }
+                            if (servicesChanged) {
+                                userState.updateIfNeededLocked();
                             }
-                        }
-                        if (servicesChanged) {
-                            userState.updateIfNeededLocked();
                         }
                     }
                 }