diff options
| author | 2022-04-26 01:50:29 +0000 | |
|---|---|---|
| committer | 2022-04-26 01:50:29 +0000 | |
| commit | ff8212309d14441ecc48dd63be93b22269fe864b (patch) | |
| tree | 7e2d3b75a01a9b0b85f3aefee6f18afb31fd91c5 | |
| parent | bf58a32851b9f7e5797843964067b1c65f038a5b (diff) | |
| parent | 2a3aa26b06b1c49c95862c5d533ebb643cf6dc07 (diff) | |
Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b06
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2072001
Change-Id: I00ff987c0fd87fd67b296b41ca19e8484a4a085f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 5 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 641b1a3697e2..e4fc9f3a57d1 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 394e7c3db17f..141b1412424a 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 7ea4ab13961d..0aca2939cee0 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}, |