commit 2a3aa26b06b1c49c95862c5d533ebb643cf6dc07
author Colin Cross <ccross@android.com> Tue Apr 26 01:15:38 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 26 01:15:38 2022 +0000
tree db02c82c8f6b70bc62ecb2eeddb8a2eb20e1a482
parent 75eb24817bb67657e93bae4e4559b6f9948bef5a
parent b0b0bb98821dc64e34ef13ec9b8c95a58684af2e

Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build"

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 641b1a3..e4fc9f3 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -29612,6 +29612,7 @@
     field public static final int S = 31; // 0x1f
     field public static final int S_V2 = 32; // 0x20
     field public static final int TIRAMISU = 10000; // 0x2710
+    field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 394e7c3..141b141 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1167,6 +1167,11 @@
          * Tiramisu.
          */
         public static final int TIRAMISU = CUR_DEVELOPMENT;
+
+        /**
+         * Upside Down Cake.
+         */
+        public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */

tools/aapt2/SdkConstants.cpp

diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 7ea4ab1..0aca293 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -27,7 +27,7 @@
 
 static ApiVersion sDevelopmentSdkLevel = 10000;
 static const auto sDevelopmentSdkCodeNames =
-    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"});
+    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});
 
 static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
     {0x021c, 1},