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

Merge "Prevent system reset staged installer bypass flag unexpactly" into rvc-dev am: 809bf93563 am: d03b501796

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12106109

Change-Id: I8755800d97def9013b7f3a97f2a455537a71b285
This commit is contained in:
TreeHugger Robot
2020-07-09 16:55:28 +00:00
committed by Automerger Merge Worker
parent 0238551d6d d03b501796
commit 6a0ff25f9a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -589,12 +589,12 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
} }
} }
if (mBypassNextStagedInstallerCheck) { if (params.isStaged && !isCalledBySystemOrShell(callingUid)) {
mBypassNextStagedInstallerCheck = false; if (mBypassNextStagedInstallerCheck) {
} else if (params.isStaged mBypassNextStagedInstallerCheck = false;
&& !isCalledBySystemOrShell(callingUid) } else if (!isStagedInstallerAllowed(requestedInstallerPackageName)) {
&& !isWhitelistedStagedInstaller(requestedInstallerPackageName)) { throw new SecurityException("Installer not allowed to commit staged install");
throw new SecurityException("Installer not allowed to commit staged install"); }
} }
if (!params.isMultiPackage) { if (!params.isMultiPackage) {
@@ -725,7 +725,7 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements
|| callingUid == Process.SHELL_UID; || callingUid == Process.SHELL_UID;
} }
private boolean isWhitelistedStagedInstaller(String installerName) { private boolean isStagedInstallerAllowed(String installerName) {
return SystemConfig.getInstance().getWhitelistedStagedInstallers().contains(installerName); return SystemConfig.getInstance().getWhitelistedStagedInstallers().contains(installerName);
} }