diff options
| author | 2023-02-21 19:46:05 +0000 | |
|---|---|---|
| committer | 2023-02-23 15:22:10 +0000 | |
| commit | 20aacbf01230dee7fa8f161bba52cce46f36376f (patch) | |
| tree | cfa0b8ca67b75e106cf79c62f24dff888a4f5823 | |
| parent | a62ebeca2172d295040367038b1a995987c1c520 (diff) | |
Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build"
This reverts commit e422b7da01a56766996ed5b8f4e9b78d8edd7951.
Reason for revert: Test failures on tm-branches b/269588126
Change-Id: I529eba46a1c341e75b02b59432e011fada8ae648
Bug: 269470863
Fixes: 269588126
Merged-In: Icb6ad340bfea7109aac9b74c6fb5165c030df16c
| -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, 1 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 8fb0d676822a..c8a43db2f9c2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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 { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index dbd602f27c11..0b956f8bf9e0 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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". */ diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp index 34e8edb0a47f..8ea43abff895 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", "UpsideDownCake"}); + std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"}); static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = { {0x021c, 1}, |