Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Ensure package names read from config are system packages. am: 6a56247200

Browse Source 
Change-Id: I8db4250c57c8338f61369c598e48e48c73ca2e44
This commit is contained in:
Automerger Merge Worker
2020-01-31 00:48:25 +00:00
parent 2bb6108f1e 6a56247200
commit c40e971e98
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -3007,8 +3007,7 @@ public class PackageManagerService extends IPackageManager.Stub
mWellbeingPackage = getWellbeingPackageName(); mWellbeingPackage = getWellbeingPackageName();
mDocumenterPackage = getDocumenterPackageName(); mDocumenterPackage = getDocumenterPackageName();
mConfiguratorPackage = mConfiguratorPackage = getDeviceConfiguratorPackageName();
mContext.getString(R.string.config_deviceConfiguratorPackageName);
mAppPredictionServicePackage = getAppPredictionServicePackageName(); mAppPredictionServicePackage = getAppPredictionServicePackageName();
mIncidentReportApproverPackage = getIncidentReportApproverPackageName(); mIncidentReportApproverPackage = getIncidentReportApproverPackageName();
mTelephonyPackages = getTelephonyPackageNames(); mTelephonyPackages = getTelephonyPackageNames();
@@ -20518,7 +20517,8 @@ public class PackageManagerService extends IPackageManager.Stub
@Override @Override
public String getSystemTextClassifierPackageName() { public String getSystemTextClassifierPackageName() {
return mContext.getString(R.string.config_defaultTextClassifierPackage); return ensureSystemPackageName(mContext.getString(
R.string.config_defaultTextClassifierPackage));
} }
@Override @Override
@@ -20528,7 +20528,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (flattenedComponentName != null) { if (flattenedComponentName != null) {
ComponentName componentName = ComponentName.unflattenFromString(flattenedComponentName); ComponentName componentName = ComponentName.unflattenFromString(flattenedComponentName);
if (componentName != null && componentName.getPackageName() != null) { if (componentName != null && componentName.getPackageName() != null) {
return componentName.getPackageName(); return ensureSystemPackageName(componentName.getPackageName());
} }
} }
return null; return null;
@@ -20553,9 +20553,15 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
@Nullable
private String getDeviceConfiguratorPackageName() {
return ensureSystemPackageName(mContext.getString(
R.string.config_deviceConfiguratorPackageName));
}
@Override @Override
public String getWellbeingPackageName() { public String getWellbeingPackageName() {
return mContext.getString(R.string.config_defaultWellbeingPackage); return ensureSystemPackageName(mContext.getString(R.string.config_defaultWellbeingPackage));
} }
@Override @Override
@@ -20570,7 +20576,7 @@ public class PackageManagerService extends IPackageManager.Stub
if (appPredictionServiceComponentName == null) { if (appPredictionServiceComponentName == null) {
return null; return null;
} }
return appPredictionServiceComponentName.getPackageName(); return ensureSystemPackageName(appPredictionServiceComponentName.getPackageName());
} }
@Override @Override
@@ -20587,11 +20593,23 @@ public class PackageManagerService extends IPackageManager.Stub
if (systemCaptionsServiceComponentName == null) { if (systemCaptionsServiceComponentName == null) {
return null; return null;
} }
return systemCaptionsServiceComponentName.getPackageName(); return ensureSystemPackageName(systemCaptionsServiceComponentName.getPackageName());
} }
public String getIncidentReportApproverPackageName() { 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 @Override