From 9308df177221c6f4aff96ccf8b7738987a2d900a Mon Sep 17 00:00:00 2001 From: Alexander Roederer Date: Fri, 14 Apr 2023 23:00:46 +0000 Subject: [PATCH] Revert "Revert "Revert "Enable low target sdk install block by default""" This reverts commit 08d73f2f3650381c44d97ae1796ba806d4d3b446. Reason for revert: DroidMonitor: Culprit for b/278113755, verified through ABTD before revert submission. Change-Id: I055ea8937368206a9e29362a0d711429c8fd94f8 --- .../java/com/android/server/pm/InstallPackageHelper.java | 8 ++++---- .../java/com/android/server/pm/PackageManagerService.java | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java index 569999e48dea3..7fe6c7d5aa93b 100644 --- a/services/core/java/com/android/server/pm/InstallPackageHelper.java +++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java @@ -1134,22 +1134,22 @@ final class InstallPackageHelper { // behavior. if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, "MinInstallableTargetSdk__install_block_enabled", - true)) { + false)) { int minInstallableTargetSdk = DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, "MinInstallableTargetSdk__min_installable_target_sdk", - PackageManagerService.MIN_INSTALLABLE_TARGET_SDK); + 0); // Determine if enforcement is in strict mode boolean strictMode = false; if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, "MinInstallableTargetSdk__install_block_strict_mode_enabled", - true)) { + false)) { if (parsedPackage.getTargetSdkVersion() < DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, "MinInstallableTargetSdk__strict_mode_target_sdk", - PackageManagerService.MIN_INSTALLABLE_TARGET_SDK)) { + 0)) { strictMode = true; } } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index c5d7d075efd1a..d3ee52c484481 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -557,14 +557,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService // How many required verifiers can be on the system. 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. // TODO(b/260124949): Clean this up with the legacy dexopt code. public static final int REASON_FIRST_BOOT = 0;