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

Commit ff821230 authored Apr 26, 2022 by Colin Cross Committed by Automerger Merge Worker Apr 26, 2022

Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build" am: 2a3aa26b

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>

parents bf58a328 2a3aa26b

core/api/current.txt

+1 −0

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

core/java/android/os/Build.java

+5 −0

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

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"});
		std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});

		static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
		{0x021c, 1},