Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd329dda authored Feb 23, 2023 by Patrick Baumann Committed by Automerger Merge Worker Feb 23, 2023

Revert "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 20aacbf0

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

Change-Id: I902b16525977f8a556c43b18807a3a6a5ce45580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 199ce365 20aacbf0

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -30979,7 +30979,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 {

core/java/android/os/Build.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -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". */

tools/aapt2/SdkConstants.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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},