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

Merge "Revert "Enable low target sdk install block by default"" into udc-dev

Browse Source
This commit is contained in:
Nick Kovacs
2023-03-14 23:39:20 +00:00
committed by Android (Google) Code Review
parent 360db7b87b db0fc499b1
commit 817ef20b05
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1134,22 +1134,22 @@ final class InstallPackageHelper {
// behavior. // behavior.
if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,
"MinInstallableTargetSdk__install_block_enabled", "MinInstallableTargetSdk__install_block_enabled",
true)) { false)) {
int minInstallableTargetSdk = int minInstallableTargetSdk =
DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,
"MinInstallableTargetSdk__min_installable_target_sdk", "MinInstallableTargetSdk__min_installable_target_sdk",
PackageManagerService.MIN_INSTALLABLE_TARGET_SDK); 0);
// Determine if enforcement is in strict mode // Determine if enforcement is in strict mode
boolean strictMode = false; boolean strictMode = false;
if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,
"MinInstallableTargetSdk__install_block_strict_mode_enabled", "MinInstallableTargetSdk__install_block_strict_mode_enabled",
true)) { false)) {
if (parsedPackage.getTargetSdkVersion() if (parsedPackage.getTargetSdkVersion()
< DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, < DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,
"MinInstallableTargetSdk__strict_mode_target_sdk", "MinInstallableTargetSdk__strict_mode_target_sdk",
PackageManagerService.MIN_INSTALLABLE_TARGET_SDK)) { 0)) {
strictMode = true; strictMode = true;
} }
} }

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

@@ -557,14 +557,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService
// How many required verifiers can be on the system. // How many required verifiers can be on the system.
private static final int REQUIRED_VERIFIERS_MAX_COUNT = 2; private static final int REQUIRED_VERIFIERS_MAX_COUNT = 2;
/**
* Specifies the minimum target SDK version an apk must specify in order to be installed
* on the system. This improves security and privacy by blocking low
* target sdk apps as malware can target older sdk versions to avoid
* the enforcement of new API behavior.
*/
public static final int MIN_INSTALLABLE_TARGET_SDK = Build.VERSION_CODES.M;
// Compilation reasons. // Compilation reasons.
// TODO(b/260124949): Clean this up with the legacy dexopt code. // TODO(b/260124949): Clean this up with the legacy dexopt code.
public static final int REASON_FIRST_BOOT = 0; public static final int REASON_FIRST_BOOT = 0;