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

Merge "Check that only allowed installers can perform a non-staged APEX update" into sc-dev

Browse Source
This commit is contained in:
Nikita Ioffe
2021-06-08 09:42:47 +00:00
committed by Android (Google) Code Review
parent 855929568b fa42461aa1
commit 42b407a0fb
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/PackageInstallerService.java
View File

@@ -653,13 +653,20 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
} }
if (params.isStaged && !isCalledBySystemOrShell(callingUid)) { if (params.isStaged && !isCalledBySystemOrShell(callingUid)) {
if (mBypassNextStagedInstallerCheck) { if (!mBypassNextStagedInstallerCheck
mBypassNextStagedInstallerCheck = false; && !isStagedInstallerAllowed(requestedInstallerPackageName)) {
} else if (!isStagedInstallerAllowed(requestedInstallerPackageName)) {
throw new SecurityException("Installer not allowed to commit staged install"); throw new SecurityException("Installer not allowed to commit staged install");
} }
} }
if (isApex && !isCalledBySystemOrShell(callingUid)) {
if (!mBypassNextStagedInstallerCheck
&& !isStagedInstallerAllowed(requestedInstallerPackageName)) {
throw new SecurityException(
"Installer not allowed to commit non-staged APEX install");
}
}
mBypassNextStagedInstallerCheck = false;
if (!params.isMultiPackage) { if (!params.isMultiPackage) {
// Only system components can circumvent runtime permissions when installing. // Only system components can circumvent runtime permissions when installing.
if ((params.installFlags & PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0 if ((params.installFlags & PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0