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

This reverts commit e422b7da01.

Reason for revert: Test failures on tm-branches b/269588126

Change-Id: I529eba46a1c341e75b02b59432e011fada8ae648
Bug: 269470863
Fixes: 269588126
Merged-In: Icb6ad340bfea7109aac9b74c6fb5165c030df16c
This commit is contained in:
Patrick Baumann
2023-02-21 19:46:05 +00:00
committed by Paul Duffin
parent a62ebeca21
commit 20aacbf012
3 changed files with 1 additions and 7 deletions

View File

@@ -30978,7 +30978,6 @@ 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 = 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 {

View File

@@ -1167,11 +1167,6 @@ public class Build {
* Tiramisu.
*/
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". */

View File

@@ -27,7 +27,7 @@ namespace aapt {
static ApiVersion sDevelopmentSdkLevel = 10000;
static const auto sDevelopmentSdkCodeNames =
std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});
std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"});
static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
{0x021c, 1},