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

Merge "Use apex name when querying privapp allowlists" into tm-dev

Browse Source
This commit is contained in:
Andrei-Valentin Onea
2022-03-14 15:11:28 +00:00
committed by Android (Google) Code Review
parent 3f1d6d7567 37389f61c1
commit ba30e36310
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/com/android/server/SystemConfig.java
View File

@@ -435,15 +435,15 @@ public class SystemConfig {
}
/** Get privapp permission allowlist for an apk-in-apex. */
public ArraySet<String> getApexPrivAppPermissions(String module, String packageName) {
return mApexPrivAppPermissions.getOrDefault(module, EMPTY_PERMISSIONS)
.get(packageName);
public ArraySet<String> getApexPrivAppPermissions(String apexName, String apkPackageName) {
return mApexPrivAppPermissions.getOrDefault(apexName, EMPTY_PERMISSIONS)
.get(apkPackageName);
}
/** Get privapp permissions denylist for an apk-in-apex. */
public ArraySet<String> getApexPrivAppDenyPermissions(String module, String packageName) {
return mApexPrivAppDenyPermissions.getOrDefault(module, EMPTY_PERMISSIONS)
.get(packageName);
public ArraySet<String> getApexPrivAppDenyPermissions(String apexName, String apkPackageName) {
return mApexPrivAppDenyPermissions.getOrDefault(apexName, EMPTY_PERMISSIONS)
.get(apkPackageName);
}
public ArraySet<String> getVendorPrivAppPermissions(String packageName) {

8
services/core/java/com/android/server/pm/PackageManagerShellCommand.java
View File

@@ -2540,8 +2540,10 @@ class PackageManagerShellCommand extends ShellCommand {
privAppPermissions = SystemConfig.getInstance()
.getSystemExtPrivAppPermissions(pkg);
} else if (isApexApp(pkg)) {
final String apexName = ApexManager.getInstance().getApexModuleNameForPackageName(
getApexPackageNameContainingPackage(pkg));
privAppPermissions = SystemConfig.getInstance()
.getApexPrivAppPermissions(getApexPackageNameContainingPackage(pkg), pkg);
.getApexPrivAppPermissions(apexName, pkg);
} else {
privAppPermissions = SystemConfig.getInstance().getPrivAppPermissions(pkg);
}
@@ -2567,8 +2569,10 @@ class PackageManagerShellCommand extends ShellCommand {
privAppPermissions = SystemConfig.getInstance()
.getSystemExtPrivAppDenyPermissions(pkg);
} else if (isApexApp(pkg)) {
final String apexName = ApexManager.getInstance().getApexModuleNameForPackageName(
getApexPackageNameContainingPackage(pkg));
privAppPermissions = SystemConfig.getInstance()
.getApexPrivAppDenyPermissions(getApexPackageNameContainingPackage(pkg), pkg);
.getApexPrivAppDenyPermissions(apexName, pkg);
} else {
privAppPermissions = SystemConfig.getInstance().getPrivAppDenyPermissions(pkg);
}

5
services/core/java/com/android/server/pm/permission/PermissionManagerServiceImpl.java
View File

@@ -3291,10 +3291,13 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt
} else if (pkg.isSystemExt()) {
permissions = systemConfig.getSystemExtPrivAppPermissions(pkg.getPackageName());
} else if (containingApexPackageName != null) {
final ApexManager apexManager = ApexManager.getInstance();
final String apexName = apexManager.getApexModuleNameForPackageName(
containingApexPackageName);
final Set<String> privAppPermissions = systemConfig.getPrivAppPermissions(
pkg.getPackageName());
final Set<String> apexPermissions = systemConfig.getApexPrivAppPermissions(
containingApexPackageName, pkg.getPackageName());
apexName, pkg.getPackageName());
if (privAppPermissions != null) {
// TODO(andreionea): Remove check as soon as all apk-in-apex
// permission allowlists are migrated.