Merge "Fixes NPE on null pkg" into rvc-dev (7b3b0611) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/AppsFilter.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -446,11 +446,6 @@ public class AppsFilter {
		}
		}

		if (!newPkgSetting.pkg.getProtectedBroadcasts().isEmpty()) {
		mProtectedBroadcasts.addAll(newPkgSetting.pkg.getProtectedBroadcasts());
		recomputeComponentVisibility(existingSettings, newPkgSetting.pkg.getPackageName());
		}

		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage");
		try {
		final AndroidPackage newPkg = newPkgSetting.pkg;
		@@ -459,6 +454,11 @@ public class AppsFilter {
		return;
		}

		if (!newPkg.getProtectedBroadcasts().isEmpty()) {
		mProtectedBroadcasts.addAll(newPkg.getProtectedBroadcasts());
		recomputeComponentVisibility(existingSettings, newPkg.getPackageName());
		}

		final boolean newIsForceQueryable =
		mForceQueryable.contains(newPkgSetting.appId)
		/* shared user that is already force queryable */