Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 (2cc9140e) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -674,7 +674,8 @@ public class AppsFilter {
		Trace.endSection();

		if (callingPkgSetting != null) {
		if (!mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
		if (callingPkgSetting.pkg != null
		&& !mFeatureConfig.packageIsEnabled(callingPkgSetting.pkg)) {
		if (DEBUG_LOGGING) {
		log(callingSetting, targetPkgSetting, "DISABLED");
		}
		@@ -682,7 +683,8 @@ public class AppsFilter {
		}
		} else {
		for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {
		if (!mFeatureConfig.packageIsEnabled(callingSharedPkgSettings.valueAt(i).pkg)) {
		final AndroidPackage pkg = callingSharedPkgSettings.valueAt(i).pkg;
		if (pkg != null && !mFeatureConfig.packageIsEnabled(pkg)) {
		if (DEBUG_LOGGING) {
		log(callingSetting, targetPkgSetting, "DISABLED");
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ import java.util.Set;
		public class PackageSetting extends PackageSettingBase {
		int appId;

		@Nullable
		public AndroidPackage pkg;
		/**
		* WARNING. The object reference is important. We perform integer equality and NOT