Merge "Check that only allowed installers can perform a non-staged APEX update" into sc-dev (42b407a0) · Commits · e / os / android_frameworks_base

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -653,13 +653,20 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		}

		if (params.isStaged && !isCalledBySystemOrShell(callingUid)) {
		if (mBypassNextStagedInstallerCheck) {
		mBypassNextStagedInstallerCheck = false;
		} else if (!isStagedInstallerAllowed(requestedInstallerPackageName)) {
		if (!mBypassNextStagedInstallerCheck
		&& !isStagedInstallerAllowed(requestedInstallerPackageName)) {
		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) {
		// Only system components can circumvent runtime permissions when installing.
		if ((params.installFlags & PackageManager.INSTALL_GRANT_RUNTIME_PERMISSIONS) != 0