From e4e3d4a1cd394c5109328c1ae948b8f268245273 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Tue, 23 Apr 2024 18:03:08 +0000
Subject: [PATCH] V is 35.
It's not bromine, it's not a gauge of film: it's the next Android
release.
Bug: 335304236
Test: presubmit
Change-Id: I20b47bf5c4d922f2e2061bd1ef0606fb5a7f7efb
---
core/api/current.txt | 2 +-
core/java/android/os/Build.java | 2 +-
tools/aapt/SdkConstants.h | 1 +
tools/aapt2/SdkConstants.h | 1 +
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/api/current.txt b/core/api/current.txt
index 7d9ce58a559c..2f2a7656e680 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -32743,7 +32743,7 @@ package android.os {
field public static final int S_V2 = 32; // 0x20
field public static final int TIRAMISU = 33; // 0x21
field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22
- field public static final int VANILLA_ICE_CREAM = 10000; // 0x2710
+ field public static final int VANILLA_ICE_CREAM = 35; // 0x23
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 2b6b358bab81..45121807b57d 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1229,7 +1229,7 @@ public class Build {
/**
* Vanilla Ice Cream.
*/
- public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
+ public static final int VANILLA_ICE_CREAM = 35;
}
/** The type of build, like "user" or "eng". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index e2c161482857..ebb82ce1e2b7 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -50,6 +50,7 @@ enum {
SDK_S_V2 = 32,
SDK_TIRAMISU = 33,
SDK_UPSIDE_DOWN_CAKE = 34,
+ SDK_VANILLA_ICE_CREAM = 35,
SDK_CUR_DEVELOPMENT = 10000,
};
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index e47704ea2725..f131cc6d7553 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -60,6 +60,7 @@ enum : ApiVersion {
SDK_S_V2 = 32,
SDK_TIRAMISU = 33,
SDK_UPSIDE_DOWN_CAKE = 34,
+ SDK_VANILLA_ICE_CREAM = 35,
SDK_CUR_DEVELOPMENT = 10000,
};
--
GitLab