Merge "Use the new vendor API format" into main (cb5ee5bf) · Commits · e / os / android_frameworks_base

core/java/android/os/Build.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -1238,6 +1238,18 @@ public class Build {
		public static final int VANILLA_ICE_CREAM = 35;
		}

		/**
		* The vendor API for 2024 Q2
		*
		* <p>For Android 14-QPR3 and later, the vendor API level is completely decoupled from the SDK
		* API level and the format has switched to YYYYMM (year and month)
		*
		* @see <a href="https://preview.source.android.com/docs/core/architecture/api-flags">Vendor API
		* level</a>
		* @hide
		*/
		public static final int VENDOR_API_2024_Q2 = 202404;

		/** The type of build, like "user" or "eng". */
		public static final String TYPE = getString("ro.build.type");

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class TelephonyFrameworkInitializer {
		// Check SDK version of the vendor partition.
		final int vendorApiLevel = SystemProperties.getInt(
		"ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT);
		if (vendorApiLevel < Build.VERSION_CODES.VANILLA_ICE_CREAM) return true;
		if (vendorApiLevel < Build.VENDOR_API_2024_Q2) return true;

		// Check SDK version of the client app.
		if (!Compatibility.isChangeEnabled(ENABLE_CHECKING_TELEPHONY_FEATURES)) return true;