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

Commit ccb133dd authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Revert "HACK: allow pre-release SDKs from any prerelease platform." 

This reverts commit b4f328c5.

Reason for revert: not needed anymore

Change-Id: I3a6f6f9de768528ddfea08f8ceb8d9f5655906e6
parent b4f328c5

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

+0 −21
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.os.ClassLoaderFactory;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.XmlUtils;

import com.android.modules.utils.build.UnboundedSdkLevel;



import libcore.io.IoUtils;

import libcore.util.EmptyArray;
@@ -2629,16 +2628,6 @@ public class PackageParser { 
            return Build.VERSION_CODES.CUR_DEVELOPMENT;

        }



        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0) {

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

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

            return Build.VERSION.SDK_INT;

        }

        if (UnboundedSdkLevel.isAtMost(targetCode)) {

            return Build.VERSION_CODES.CUR_DEVELOPMENT;

        }



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

        if (platformSdkCodenames.length > 0) {

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

        }



        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0) {

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

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

            return Build.VERSION.SDK_INT;

        }

        if (UnboundedSdkLevel.isAtMost(minCode)) {

            return Build.VERSION_CODES.CUR_DEVELOPMENT;

        }



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

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

        }



        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0) {

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

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

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

        }

        if (UnboundedSdkLevel.isAtMost(minCode)) {

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

        }



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

        if (platformSdkCodenames.length > 0) {

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,
@@ -393,16 +383,6 @@ public class FrameworkParsingPackageUtils { 
            return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);

        }



        // STOPSHIP: hack for the pre-release SDK

        if (platformSdkCodenames.length == 0) {

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

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

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

        }

        if (UnboundedSdkLevel.isAtMost(targetCode)) {

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

        }



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

        if (platformSdkCodenames.length > 0) {

            return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK,

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/parsing/PackageParserLegacyCoreTest.java

+2 −3
Original line number Diff line number Diff line
@@ -93,9 +93,8 @@ public class PackageParserLegacyCoreTest { 
    private static final int PLATFORM_VERSION = 20;

    private static final int NEWER_VERSION = 30;



    // STOPSHIP: hack for the pre-release SDK

    private static final int DISALLOW_PRERELEASE = Build.VERSION_CODES.CUR_DEVELOPMENT;

    private static final int DISALLOW_RELEASED = Build.VERSION.SDK_INT;

    private static final int DISALLOW_PRERELEASE = -1;

    private static final int DISALLOW_RELEASED = -1;



    @Rule public final Expect expect = Expect.create();