diff options
| -rwxr-xr-x | core/java/android/os/Build.java | 12 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyFrameworkInitializer.java | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 8aa2c35b49e4..30d2dec8b4c4 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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"); diff --git a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java index f5688bfffa02..7356cdc8889b 100644 --- a/telephony/java/android/telephony/TelephonyFrameworkInitializer.java +++ b/telephony/java/android/telephony/TelephonyFrameworkInitializer.java @@ -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; |