Merge "DO NOT MERGE Ensure package names read from config are system packages." into qt-qpr1-dev (f2a1775a) · Commits · e / os / android_frameworks_base

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

+26 −8

Original line number	Diff line number	Diff line
		@@ -3130,8 +3130,7 @@ public class PackageManagerService extends IPackageManager.Stub

		mWellbeingPackage = getWellbeingPackageName();
		mDocumenterPackage = getDocumenterPackageName();
		mConfiguratorPackage =
		mContext.getString(R.string.config_deviceConfiguratorPackageName);
		mConfiguratorPackage = getDeviceConfiguratorPackageName();
		mAppPredictionServicePackage = getAppPredictionServicePackageName();
		mIncidentReportApproverPackage = getIncidentReportApproverPackageName();

		@@ -21121,7 +21120,8 @@ public class PackageManagerService extends IPackageManager.Stub

		@Override
		public String getSystemTextClassifierPackageName() {
		return mContext.getString(R.string.config_defaultTextClassifierPackage);
		return ensureSystemPackageName(mContext.getString(
		R.string.config_defaultTextClassifierPackage));
		}

		@Override
		@@ -21131,7 +21131,7 @@ public class PackageManagerService extends IPackageManager.Stub
		if (flattenedComponentName != null) {
		ComponentName componentName = ComponentName.unflattenFromString(flattenedComponentName);
		if (componentName != null && componentName.getPackageName() != null) {
		return componentName.getPackageName();
		return ensureSystemPackageName(componentName.getPackageName());
		}
		}
		return null;
		@@ -21156,9 +21156,15 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		@Nullable
		private String getDeviceConfiguratorPackageName() {
		return ensureSystemPackageName(mContext.getString(
		R.string.config_deviceConfiguratorPackageName));
		}

		@Override
		public String getWellbeingPackageName() {
		return mContext.getString(R.string.config_defaultWellbeingPackage);
		return ensureSystemPackageName(mContext.getString(R.string.config_defaultWellbeingPackage));
		}

		@Override
		@@ -21173,7 +21179,7 @@ public class PackageManagerService extends IPackageManager.Stub
		if (appPredictionServiceComponentName == null) {
		return null;
		}
		return appPredictionServiceComponentName.getPackageName();
		return ensureSystemPackageName(appPredictionServiceComponentName.getPackageName());
		}

		@Override
		@@ -21190,11 +21196,23 @@ public class PackageManagerService extends IPackageManager.Stub
		if (systemCaptionsServiceComponentName == null) {
		return null;
		}
		return systemCaptionsServiceComponentName.getPackageName();
		return ensureSystemPackageName(systemCaptionsServiceComponentName.getPackageName());
		}

		public String getIncidentReportApproverPackageName() {
		return mContext.getString(R.string.config_incidentReportApproverPackage);
		return ensureSystemPackageName(mContext.getString(
		R.string.config_incidentReportApproverPackage));
		}

		@Nullable
		private String ensureSystemPackageName(@Nullable String packageName) {
		if (packageName == null) {
		return null;
		}
		if (getPackageInfo(packageName, MATCH_FACTORY_ONLY, UserHandle.USER_SYSTEM) == null) {
		return null;
		}
		return packageName;
		}

		@Override