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

Commit f0671376 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Automerger Merge Worker
Browse files

Revert "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" am: 6f525083 am: e189e7ab 

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



Change-Id: I410ce3b7d69bc05fdd4d0e470490c1953a919594
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58bc0c4c e189e7ab

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

+0 −18
Original line number Diff line number Diff line
@@ -2618,15 +2618,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
@@ -2698,15 +2689,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

+4 −26
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,28 +368,15 @@ 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)) {

        if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(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)) {

        // 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);

        }

        } catch (IllegalArgumentException e) {

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

        }



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

        if (platformSdkCodenames.length > 0) {

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

+2 −2
Original line number Diff line number Diff line
@@ -393,14 +393,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");

    }