diff options
| author | 2025-01-20 16:56:47 +0100 | |
|---|---|---|
| committer | 2025-01-20 16:56:47 +0100 | |
| commit | 5ae6e84c237652bb86df94b73cab8403c72cf049 (patch) | |
| tree | 0ff72b95459add73ebc580f2fa2c306ab102d2a5 | |
| parent | 406336989d7ed25475afbb7a5585ad69c0122349 (diff) | |
B is 36.
It's square! It's triangular! It might only be semiperfect, but it is the next Android release!
Flag: EXEMPT Baklava Finalization
Bug: 376680864
Test: presubmit
Change-Id: I0647974b7b2696a46158e65e81c6890faf98c009
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 2 | ||||
| -rw-r--r-- | tools/aapt/SdkConstants.h | 1 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 26c64bd7adbc..e0fc9590f9f7 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -33468,7 +33468,7 @@ package android.os { public static class Build.VERSION_CODES { ctor public Build.VERSION_CODES(); - field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int BAKLAVA = 10000; // 0x2710 + field @FlaggedApi("android.sdk.major_minor_versioning_scheme") 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 @@ -33508,7 +33508,7 @@ package android.os { } @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL { - field public static final int BAKLAVA = 1000000000; // 0x3b9aca00 + 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 field public static final int CUPCAKE = 300000; // 0x493e0 diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index c51ad9e986ef..1e6469c57fa9 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1271,7 +1271,7 @@ public class Build { * Baklava. */ @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) - public static final int BAKLAVA = CUR_DEVELOPMENT; + public static final int BAKLAVA = 36; } /** @hide */ diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h index ebb82ce1e2b7..af6063c37820 100644 --- a/tools/aapt/SdkConstants.h +++ b/tools/aapt/SdkConstants.h @@ -51,6 +51,7 @@ enum { SDK_TIRAMISU = 33, SDK_UPSIDE_DOWN_CAKE = 34, SDK_VANILLA_ICE_CREAM = 35, + SDK_BAKLAVA = 36, SDK_CUR_DEVELOPMENT = 10000, }; diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h index f131cc6d7553..2a93c177e2ce 100644 --- a/tools/aapt2/SdkConstants.h +++ b/tools/aapt2/SdkConstants.h @@ -61,6 +61,7 @@ enum : ApiVersion { SDK_TIRAMISU = 33, SDK_UPSIDE_DOWN_CAKE = 34, SDK_VANILLA_ICE_CREAM = 35, + SDK_BAKLAVA = 36, SDK_CUR_DEVELOPMENT = 10000, }; |