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

Merge "DO NOT MERGE Ensure package names read from config are system packages." into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-31 00:36:50 +00:00
committed by Android (Google) Code Review
parent 7891cda862 6a56247200
commit f2a1775a86
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

@@ -3130,8 +3130,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();
@@ -21121,7 +21120,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
@@ -21131,7 +21131,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;
@@ -21156,9 +21156,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
@@ -21173,7 +21179,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
@@ -21190,11 +21196,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