Merge "HACK: allow apps with pre-release SDK RESTRICT AUTOMERGE" into udc-dev (3dbf86ba) · Commits · e / os / android_frameworks_base

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

+18 −0

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

+25 −8

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

		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) {
		// isAtMost() throws it when encountering an older SDK codename
		return input.error(PackageManager.INSTALL_FAILED_OLDER_SDK, e.getMessage());

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

		// If it's a pre-release SDK and the codename matches this platform, it
		// definitely targets this SDK.
		if (matchTargetCode(platformSdkCodenames, targetCode)) {
		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");
		}

		// 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
		@@ -445,14 +445,14 @@ public class SystemConfigTest {
		+ " <library \n"
		+ " name=\"foo\"\n"
		+ " file=\"" + mFooJar + "\"\n"
		+ " on-bootclasspath-before=\"Q\"\n"
		+ " on-bootclasspath-before=\"A\"\n"
		+ " on-bootclasspath-since=\"W\"\n"
		+ " />\n\n"
		+ " </permissions>";
		parseSharedLibraries(contents);
		assertFooIsOnlySharedLibrary();
		SystemConfig.SharedLibraryEntry entry = mSysConfig.getSharedLibraries().get("foo");
		assertThat(entry.onBootclasspathBefore).isEqualTo("Q");
		assertThat(entry.onBootclasspathBefore).isEqualTo("A");
		assertThat(entry.onBootclasspathSince).isEqualTo("W");
		}