Merge "Merge "Prevent system reset staged installer bypass flag unexpactly"... (4c5b1d89) · Commits · e / os / android_frameworks_base

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

+7 −7

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

		if (params.isStaged && !isCalledBySystemOrShell(callingUid)) {
		if (mBypassNextStagedInstallerCheck) {
		mBypassNextStagedInstallerCheck = false;
		} else if (params.isStaged
		&& !isCalledBySystemOrShell(callingUid)
		&& !isWhitelistedStagedInstaller(requestedInstallerPackageName)) {
		} else if (!isStagedInstallerAllowed(requestedInstallerPackageName)) {
		throw new SecurityException("Installer not allowed to commit staged install");
		}
		}

		if (!params.isMultiPackage) {
		// Only system components can circumvent runtime permissions when installing.
		@@ -725,7 +725,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
		\|\| callingUid == Process.SHELL_UID;
		}

		private boolean isWhitelistedStagedInstaller(String installerName) {
		private boolean isStagedInstallerAllowed(String installerName) {
		return SystemConfig.getInstance().getWhitelistedStagedInstallers().contains(installerName);
		}