Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28511e50 authored by Nick Kovacs's avatar Nick Kovacs Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Enable low target sdk install block by default""" into... 

Merge "Revert "Revert "Enable low target sdk install block by default""" into udc-dev am: 8df6d94c am: 3961cd50

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



Change-Id: Ie928d97343f89f14c8e001980378496af08723b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 383ee061 3961cd50

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

+4 −4
Original line number Diff line number Diff line
@@ -1135,22 +1135,22 @@ final class InstallPackageHelper { 
        // behavior.

        if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,

                "MinInstallableTargetSdk__install_block_enabled",

                false)) {

                true)) {

            int minInstallableTargetSdk =

                    DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,

                            "MinInstallableTargetSdk__min_installable_target_sdk",

                            0);

                            PackageManagerService.MIN_INSTALLABLE_TARGET_SDK);



            // Determine if enforcement is in strict mode

            boolean strictMode = false;



            if (DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,

                    "MinInstallableTargetSdk__install_block_strict_mode_enabled",

                    false)) {

                    true)) {

                if (parsedPackage.getTargetSdkVersion()

                        < DeviceConfig.getInt(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE,

                        "MinInstallableTargetSdk__strict_mode_target_sdk",

                        0)) {

                        PackageManagerService.MIN_INSTALLABLE_TARGET_SDK)) {

                    strictMode = true;

                }

            }

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

+8 −0
Original line number Diff line number Diff line
@@ -563,6 +563,14 @@ 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;