Commit bc7c4ed0 authored Nov 24, 2020 by Todd Kennedy

Fix NPE

Reported by zezeozue@; if no package defines an application
<property> tag, getProperty() was throwing an NPE within the
package manager service.

NOTE: There's now a CTS test to ensure this works. However, it's
not sufficient. As soon as there's a single system application
that defines an application <property> tag, the test will
no longer catch the condition. We need to re-write the CTS
test as a Package Manager Service unit test and verity the
behaviour outside of the running service.

Bug: 169258655
Test: atest CtsContentTestCases:PackageManagerGetPropertyTest#testPackageRemoval
Change-Id: I117272b9b831061b9e915e0eb310d809b3afca2f

parent c8cc7844

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;
		}