Merge "Remove references to flag android.sdk.major_minor_versioning_scheme" into main (6f8af0cc) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -33864,8 +33864,8 @@ package android.os {
		ctor public Build();
		method @FlaggedApi("android.os.api_for_backported_fixes") public static int getBackportedFixStatus(long);
		method @NonNull public static java.util.List<android.os.Build.Partition> getFingerprintedPartitions();
		method @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static int getMajorSdkVersion(int);
		method @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static int getMinorSdkVersion(int);
		method public static int getMajorSdkVersion(int);
		method public static int getMinorSdkVersion(int);
		method public static String getRadioVersion();
		method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public static String getSerial();
		field @FlaggedApi("android.os.api_for_backported_fixes") public static final int BACKPORTED_FIX_STATUS_FIXED = 1; // 0x1
		@@ -33921,13 +33921,13 @@ package android.os {
		field @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY;
		field @Deprecated public static final String SDK;
		field public static final int SDK_INT;
		field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int SDK_INT_FULL;
		field public static final int SDK_INT_FULL;
		field public static final String SECURITY_PATCH;
		}

		public static class Build.VERSION_CODES {
		ctor public Build.VERSION_CODES();
		field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int BAKLAVA = 36; // 0x24
		field public static final int BAKLAVA = 36; // 0x24
		field public static final int BASE = 1; // 0x1
		field public static final int BASE_1_1 = 2; // 0x2
		field public static final int CUPCAKE = 3; // 0x3
		@@ -33966,7 +33966,7 @@ package android.os {
		field public static final int VANILLA_ICE_CREAM = 35; // 0x23
		}

		@FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL {
		public static class Build.VERSION_CODES_FULL {
		field public static final int BAKLAVA = 3600000; // 0x36ee80
		field public static final int BASE = 100000; // 0x186a0
		field public static final int BASE_1_1 = 200000; // 0x30d40

core/java/android/os/Build.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ import android.app.Application;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.Context;
		import android.ravenwood.annotation.RavenwoodKeepWholeClass;
		import android.sdk.Flags;
		import android.sysprop.BackportedFixesProperties;
		import android.sysprop.DeviceProperties;
		import android.sysprop.SocProperties;
		@@ -430,7 +429,6 @@ public class Build {
		* Possible values are defined in {@link
		* android.os.Build.VERSION_CODES_FULL}.
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		public static final int SDK_INT_FULL = parseFullVersion(SystemProperties.get(
		"ro.build.version.sdk_full", ""));

		@@ -1279,7 +1277,6 @@ public class Build {
		/**
		* Baklava.
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		public static final int BAKLAVA = 36;
		}

		@@ -1296,7 +1293,6 @@ public class Build {
		*
		* @see android.os.Build.VERSION#SDK_INT_FULL
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@SuppressLint("AcronymName")
		public static class VERSION_CODES_FULL {
		private VERSION_CODES_FULL() {}
		@@ -1497,7 +1493,6 @@ public class Build {
		*
		* @return The major version encoded in a VERSION_CODES_FULL value
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		public static int getMajorSdkVersion(@SdkIntFull int sdkIntFull) {
		return sdkIntFull / VERSION_CODES_FULL.SDK_INT_MULTIPLIER;
		}
		@@ -1508,7 +1503,6 @@ public class Build {
		*
		* @return The minor version encoded in a VERSION_CODES_FULL value
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		public static int getMinorSdkVersion(@SdkIntFull int sdkIntFull) {
		return sdkIntFull % VERSION_CODES_FULL.SDK_INT_MULTIPLIER;
		}

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -1785,11 +1785,9 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		Slog.w(TAG, "**** ro.build.version.sdk not set!");
		}

		final int sdkVersionFull = android.sdk.Flags.majorMinorVersioningScheme()
		? Build.VERSION.SDK_INT_FULL : 0;
		PackageManagerService m = new PackageManagerService(injector, factoryTest,
		PackagePartitions.FINGERPRINT, Build.IS_ENG, Build.IS_USERDEBUG,
		Build.VERSION.SDK_INT, Build.VERSION.INCREMENTAL, sdkVersionFull);
		Build.VERSION.SDK_INT, Build.VERSION.INCREMENTAL, Build.VERSION.SDK_INT_FULL);

		t.traceEnd(); // "create package manager"

		@@ -2019,8 +2017,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		mSdkVersionFull = sdkVersionFull;
		// If the major version of sdkVersionFull and sdkVersion are not equal,
		// throw RuntimeException to crash the system.
		if (android.sdk.Flags.majorMinorVersioningScheme()
		&& (Build.getMajorSdkVersion(sdkVersionFull) != sdkVersion)) {
		if (Build.getMajorSdkVersion(sdkVersionFull) != sdkVersion) {
		throw new RuntimeException("sdkVersionFull:" + sdkVersionFull + " and sdkVersion: "
		+ sdkVersion + " don't match. Please check your build configurations!");
		}
		@@ -2294,8 +2291,7 @@ public class PackageManagerService implements PackageSender, TestUtilityService
		+ PackagePartitions.FINGERPRINT + " (" + Build.FINGERPRINT + ")");
		}
		mPriorSdkVersion = mIsUpgrade ? ver.sdkVersion : -1;
		mPriorSdkVersionFull = (android.sdk.Flags.majorMinorVersioningScheme() && mIsUpgrade)
		? ver.sdkVersionFull : -1;
		mPriorSdkVersionFull = mIsUpgrade ? ver.sdkVersionFull : -1;
		mInitAppsHelper = new InitAppsHelper(this, mApexManager, mInstallPackageHelper,
		mInjector.getSystemPartitions());

services/core/java/com/android/server/pm/Settings.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -506,14 +506,12 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile
		public void forceCurrent() {
		sdkVersion = Build.VERSION.SDK_INT;

		if (android.sdk.Flags.majorMinorVersioningScheme()) {
		sdkVersionFull = Build.VERSION.SDK_INT_FULL;
		if (Build.getMajorSdkVersion(sdkVersionFull) != sdkVersion) {
		throw new RuntimeException("Build.VERSION.SDK_INT_FULL:" + sdkVersionFull
		+ " and Build.VERSION.SDK_INT: " + sdkVersion + " don't match."
		+ " Please check your build configurations!");
		}
		}

		databaseVersion = CURRENT_DATABASE_VERSION;
		buildFingerprint = Build.FINGERPRINT;
		@@ -3546,9 +3544,7 @@ public final class Settings implements Watchable, Snappable, ResilientAtomicFile
		final VersionInfo ver = findOrCreateVersion(volumeUuid);
		ver.sdkVersion = parser.getAttributeInt(null, ATTR_SDK_VERSION);
		final int defaultSdkVersionFull =
		android.sdk.Flags.majorMinorVersioningScheme()
		? Build.parseFullVersion(String.valueOf(ver.sdkVersion))
		: 0;
		Build.parseFullVersion(String.valueOf(ver.sdkVersion));
		ver.sdkVersionFull = parser.getAttributeInt(null, ATTR_SDK_VERSION_FULL,
		defaultSdkVersionFull);
		ver.databaseVersion = parser.getAttributeInt(null, ATTR_DATABASE_VERSION);

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/PackageManagerSettingsTests.java

+0 −28

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.os.PersistableBundle;
		import android.os.Process;
		import android.os.UserHandle;
		import android.platform.test.annotations.Presubmit;
		import android.platform.test.annotations.RequiresFlagsDisabled;
		import android.platform.test.annotations.RequiresFlagsEnabled;
		import android.platform.test.flag.junit.CheckFlagsRule;
		import android.platform.test.flag.junit.DeviceFlagsValueProvider;
		@@ -681,20 +680,6 @@ public class PackageManagerSettingsTests {
		assertThat(readPus3.getDistractionFlags(), is(distractionFlags3));
		}

		@RequiresFlagsDisabled(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@Test
		public void testReadSettingsVersionCodeWithNoSdkVersionFull_zero() {
		/* write out files and read */
		writeNoSdkVersionFullPackageFile();
		Settings settings = makeSettings();
		assertThat(settings.readLPw(computer, createFakeUsers()), is(true));

		assertThat(settings.getInternalVersion().sdkVersion,
		is(Build.VERSION.SDK_INT));
		assertThat(settings.getInternalVersion().sdkVersionFull, is(0));
		}

		@RequiresFlagsEnabled(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@Test
		public void testReadSettingsVersionCodeWithNoSdkVersionFull_fromSdkVersion() {
		/* write out files and read */
		@@ -708,7 +693,6 @@ public class PackageManagerSettingsTests {
		is(Build.parseFullVersion(String.valueOf(Build.VERSION.SDK_INT))));
		}

		@RequiresFlagsEnabled(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@Test
		public void testReadWriteSettingsVersionCodeWithSdkVersionFull() {
		final Settings settingsUnderTest = makeSettings();
		@@ -726,18 +710,6 @@ public class PackageManagerSettingsTests {
		assertThat(readVersionInfo.sdkVersion, is(Build.VERSION.SDK_INT));
		}

		@RequiresFlagsDisabled(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@Test
		public void testSettingsGetInternalVersionNoSdkVersionFull() {
		final Settings settingsUnderTest = makeSettings();
		settingsUnderTest.writeLPr(computer, /sync=/ true);
		assertThat(settingsUnderTest.readLPw(computer, createFakeUsers()), is(true));
		assertThat(settingsUnderTest.getInternalVersion().sdkVersionFull, is(0));
		assertThat(settingsUnderTest.getInternalVersion().sdkVersion,
		is(Build.VERSION.SDK_INT));
		}

		@RequiresFlagsEnabled(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		@Test
		public void testSettingsGetInternalVersionWithSdkVersionFull() {
		final Settings settingsUnderTest = makeSettings();