Merge "Fix NPE" (a2c61cc6) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -274,7 +274,7 @@ public class PackageProperty {

		private Property getApplicationProperty(String propertyName, String packageName) {
		final ArrayMap<String, ArrayList<Property>> packagePropertyMap =
		mApplicationProperties.get(propertyName);
		mApplicationProperties != null ? mApplicationProperties.get(propertyName) : null;
		if (packagePropertyMap == null) {
		return null;
		}