Revert^2 "VanillaIceCream/35 is now REL" (ae81cabe) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2628,6 +2628,15 @@ 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
	@@ -2699,6 +2708,15 @@ 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

+25 −8

Original line number	Original line	Diff line number	Diff line
	@@ -316,6 +316,15 @@ 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,
	@@ -368,20 +377,28 @@ public class FrameworkParsingPackageUtils {
	return input.success(targetVers);		return input.success(targetVers);
	}		}

	try {		// If it's a pre-release SDK and the codename matches this platform, it
	if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {		// definitely targets this SDK.
			if (matchTargetCode(platformSdkCodenames, targetCode)) {
	return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);		return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);
	}		}
	} catch (IllegalArgumentException e) {
	// isAtMost() throws it when encountering an older SDK codename		// STOPSHIP: hack for the pre-release SDK
	return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK, e.getMessage());		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);
	}		}

	// If it's a pre-release SDK and the codename matches this platform, it		try {
	// definitely targets this SDK.		if (allowUnknownCodenames && UnboundedSdkLevel.isAtMost(targetCode)) {
	if (matchTargetCode(platformSdkCodenames, targetCode)) {
	return input.success(Build.VERSION_CODES.CUR_DEVELOPMENT);		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.		// Otherwise, we're looking at an incompatible pre-release SDK.
	if (platformSdkCodenames.length > 0) {		if (platformSdkCodenames.length > 0) {