From 1dd09eb77941713254f5c0192d1332c5826dd3f9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Feb 2023 15:02:51 -0800 Subject: [PATCH 1/2] Add VanillaIceCream to aapt2 codenames Bug: 279492191 Test: m checkbuild Change-Id: Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22 Merged-In: Ia8bd807ab25260ff6716e2aea36e4d3e8567eb22 --- tools/aapt2/SdkConstants.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index 34e8edb0a47fb..e7b37704f3ea5 100644 --- a/tools/aapt2/SdkConstants.cpp +++ b/tools/aapt2/SdkConstants.cpp @@ -26,8 +26,8 @@ using android::StringPiece; namespace aapt { static ApiVersion sDevelopmentSdkLevel = 10000; -static const auto sDevelopmentSdkCodeNames = - std::unordered_set({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"}); +static const auto sDevelopmentSdkCodeNames = std::unordered_set( + {"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake", "VanillaIceCream"}); static const std::vector> sAttrIdMap = { {0x021c, 1}, From 53d1cf77ca45fed548c041594cfdab7ea90dcfce Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 18 Jan 2023 13:48:02 -0800 Subject: [PATCH 2/2] Add VanillaIceCream to android.os.Build Bug: 279492191 Test: m checkbuild Change-Id: I1b0a9d667cd481e91cfe473747a9ad38f77b4455 Merged-In: I1b0a9d667cd481e91cfe473747a9ad38f77b4455 --- core/api/current.txt | 1 + core/java/android/os/Build.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index cf3938ade32d1..77a6fec604bec 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31081,6 +31081,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 = 10000; // 0x2710 + field public static final int VANILLA_ICE_CREAM = 10000; // 0x2710 } 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 244632a875931..2e05b8dc8da34 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1223,6 +1223,11 @@ public class Build { * Upside Down Cake. */ public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT; + + /** + * Vanilla Ice Cream. + */ + public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */