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

Commit 73af79c5 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Revert "Revert^2 "VanillaIceCream/35 is now REL"" 

This reverts commit ae81cabe.

Remove the temporary hack from the package manager that allows apps
build against a preview SDK to be installed on a REL platform.

Bug: 340822159
Test: presubmit
Change-Id: I9ddde3758b2f6ec63c8012e30ffc8c58fa34f4e9
parent f6fea76f

core/java/android/content/pm/PackageParser.java

+0 −18
Original line number Original line Diff line number Diff line
@@ -2628,15 +2628,6 @@ public class PackageParser { 
            return Build.VERSION_CODES.CUR_DEVELOPMENT;

            return Build.VERSION_CODES.CUR_DEVELOPMENT;

        }

        }





        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0

                && Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(

                targetCode)) {

            Slog.w(TAG, "Package requires development platform " + targetCode

                    + ", returning current version " + Build.VERSION.SDK_INT);

            return Build.VERSION.SDK_INT;

        }



        // Otherwise, we're looking at an incompatible pre-release SDK.

        // Otherwise, we're looking at an incompatible pre-release SDK.

        if (platformSdkCodenames.length > 0) {

        if (platformSdkCodenames.length > 0) {

            outError[0] = "Requires development platform " + targetCode

            outError[0] = "Requires development platform " + targetCode
@@ -2708,15 +2699,6 @@ public class PackageParser { 
            return Build.VERSION_CODES.CUR_DEVELOPMENT;

            return Build.VERSION_CODES.CUR_DEVELOPMENT;

        }

        }





        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0

                && Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(

                minCode)) {

            Slog.w(TAG, "Package requires min development platform " + minCode

                    + ", returning current version " + Build.VERSION.SDK_INT);

            return Build.VERSION.SDK_INT;

        }



        // Otherwise, we're looking at an incompatible pre-release SDK.

        // Otherwise, we're looking at an incompatible pre-release SDK.

        if (platformSdkCodenames.length > 0) {

        if (platformSdkCodenames.length > 0) {

            outError[0] = "Requires development platform " + minCode

            outError[0] = "Requires development platform " + minCode

core/java/android/content/pm/parsing/FrameworkParsingPackageUtils.java

+8 −25
Original line number Original line Diff line number Diff line
@@ -316,15 +316,6 @@ public class FrameworkParsingPackageUtils { 
            return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

            return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

        }

        }





        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0

                && Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(

                        minCode)) {

            Slog.w(TAG, "Parsed package requires min development platform " + minCode

                    + ", returning current version " + Build.VERSION.SDK_INT);

            return input.success(Build.VERSION.SDK_INT);

        }



        // Otherwise, we're looking at an incompatible pre-release SDK.

        // Otherwise, we're looking at an incompatible pre-release SDK.

        if (platformSdkCodenames.length > 0) {

        if (platformSdkCodenames.length > 0) {

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,
@@ -377,27 +368,19 @@ public class FrameworkParsingPackageUtils { 
            return input.success(targetVers);

            return input.success(targetVers);

        }

        }





        // If it's a pre-release SDK and the codename matches this platform, it

        // definitely targets this SDK.

        if (matchTargetCode(platformSdkCodenames, targetCode)) {

            return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

        }



        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0

                && Build.VERSION.KNOWN_CODENAMES.stream().max(String::compareTo).orElse("").equals(

                        targetCode)) {

            Slog.w(TAG, "Parsed package requires development platform " + targetCode

                    + ", returning current version " + Build.VERSION.SDK_INT);

            return input.success(Build.VERSION.SDK_INT);

        }



        try {

        try {

            if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {

            if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {

                return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

                return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

            }

            }

        } catch (IllegalArgumentException e) {

        } catch (IllegalArgumentException e) {

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK, "Bad package SDK");

            // isAtMost() throws it when encountering an older SDK codename

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK, e.getMessage());

        }



        // If it's a pre-release SDK and the codename matches this platform, it

        // definitely targets this SDK.

        if (matchTargetCode(platformSdkCodenames, targetCode)) {

            return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

        }

        }





        // Otherwise, we're looking at an incompatible pre-release SDK.

        // Otherwise, we're looking at an incompatible pre-release SDK.