From b0b0bb98821dc64e34ef13ec9b8c95a58684af2e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 13 Apr 2022 12:14:53 -0700
Subject: [PATCH] Add UpsideDownCake to aapt2 codenames and android.os.Build

Bug: 219519679
Test: m checkbuild
Change-Id: I2b668d1cd875657b27a1d52bda21f238d7020862
Merged-In: I2b668d1cd875657b27a1d52bda21f238d7020862
(cherry picked from commit d27566da4cc7e0de8efe00140fe28db1536bef43)
---
 core/api/current.txt            | 1 +
 core/java/android/os/Build.java | 5 +++++
 tools/aapt2/SdkConstants.cpp    | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 641b1a3697e21..e4fc9f3a57d15 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -29612,6 +29612,7 @@ package android.os {
     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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 394e7c3db17f6..141b1412424a7 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1167,6 +1167,11 @@ public class Build {
          * 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". */
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index 7ea4ab13961d2..0aca2939cee06 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -27,7 +27,7 @@ namespace aapt {
 
 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},