Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add UpsideDownCake to aapt2 codenames and android.os.Build am: e422b7da01

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21423290

Change-Id: Ic408730f700e822eaa65c27ce867a0d657860c96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-02-16 09:05:35 +00:00
committed by Automerger Merge Worker
parent c55837c566 e422b7da01
commit 748236fd28
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -30978,6 +30978,7 @@ package android.os {
field public static final int S = 31; // 0x1f field public static final int S = 31; // 0x1f
field public static final int S_V2 = 32; // 0x20 field public static final int S_V2 = 32; // 0x20
field public static final int TIRAMISU = 33; // 0x21 field public static final int TIRAMISU = 33; // 0x21
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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

5
core/java/android/os/Build.java
View File

@@ -1167,6 +1167,11 @@ public class Build {
* Tiramisu. * Tiramisu.
*/ */
public static final int TIRAMISU = 33; public static final int TIRAMISU = 33;
/**
* Upside Down Cake.
*/
public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */

2
tools/aapt2/SdkConstants.cpp
View File

@@ -27,7 +27,7 @@ namespace aapt {
static ApiVersion sDevelopmentSdkLevel = 10000; static ApiVersion sDevelopmentSdkLevel = 10000;
static const auto sDevelopmentSdkCodeNames = 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 = { static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
{0x021c, 1}, {0x021c, 1},