Merge "Fix NPE in PrintManagerService" into nyc-dev (3d684ca8) · Commits · e / os / android_frameworks_base

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

+11 −9

Original line number	Diff line number	Diff line
		@@ -623,10 +623,11 @@ public final class PrintManagerService extends SystemService {

		List<PrintServiceInfo> installedServices = userState
		.getPrintServices(PrintManager.ALL_SERVICES);
		if (installedServices != null) {
		final int numInstalledServices = installedServices.size();
		for (int i = 0; i < numInstalledServices; i++) {
		if (installedServices.get(i).getResolveInfo().serviceInfo.packageName
		.equals(packageName)) {
		if (installedServices.get(i).getResolveInfo()
		.serviceInfo.packageName.equals(packageName)) {
		servicesChanged = true;
		break;
		}
		@@ -636,6 +637,7 @@ public final class PrintManagerService extends SystemService {
		}
		}
		}
		}

		@Override
		public void onPackageModified(String packageName) {