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

Commit c9b87b3a authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" am: ba22ea80 am: 3edce1bc 

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



Change-Id: If7bfc0528fd5f8cde353f1eb6b664b43e6052f86
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2db32a3 3edce1bc

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

+0 −18
Original line number Diff line number Diff line
@@ -2628,15 +2628,6 @@ public class PackageParser { 
            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.

        if (platformSdkCodenames.length > 0) {

            outError[0] = "Requires development platform " + targetCode
@@ -2708,15 +2699,6 @@ public class PackageParser { 
            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.

        if (platformSdkCodenames.length > 0) {

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

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

+8 −25
Original line number Diff line number Diff line
@@ -316,15 +316,6 @@ public class FrameworkParsingPackageUtils { 
            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.

        if (platformSdkCodenames.length > 0) {

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,
@@ -377,27 +368,19 @@ public class FrameworkParsingPackageUtils { 
            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 {

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

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

            }

        } 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.

services/tests/servicestests/src/com/android/server/systemconfig/SystemConfigTest.java

+2 −2
Original line number Diff line number Diff line
@@ -445,14 +445,14 @@ public class SystemConfigTest { 
                        + "    <library \n"

                        + "        name=\"foo\"\n"

                        + "        file=\"" + mFooJar + "\"\n"

                        + "        on-bootclasspath-before=\"A\"\n"

                        + "        on-bootclasspath-before=\"Q\"\n"

                        + "        on-bootclasspath-since=\"W\"\n"

                        + "     />\n\n"

                        + " </permissions>";

        parseSharedLibraries(contents);

        assertFooIsOnlySharedLibrary();

        SystemConfig.SharedLibraryEntry entry = mSysConfig.getSharedLibraries().get("foo");

        assertThat(entry.onBootclasspathBefore).isEqualTo("A");

        assertThat(entry.onBootclasspathBefore).isEqualTo("Q");

        assertThat(entry.onBootclasspathSince).isEqualTo("W");

    }