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

Commit 48857bdb authored Apr 23, 2023 by Alex Buynytskyy Committed by Android (Google) Code Review Apr 23, 2023

Merge changes from topic "V-udc-dev-plus-aosp" into udc-dev-plus-aosp

* changes:
  Add VanillaIceCream to aapt2 codenames
  Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build""

parents 63e57985 a0029778

core/api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -32653,6 +32653,7 @@ package android.os {
		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 = 34; // 0x22
		field public static final int VANILLA_ICE_CREAM = 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
		@@ -1223,6 +1223,11 @@ public class Build {
		* Upside Down Cake.
		*/
		public static final int UPSIDE_DOWN_CAKE = 34;

		/**
		* Vanilla Ice Cream.
		*/
		public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
		}

		/** The type of build, like "user" or "eng". */

tools/aapt2/SdkConstants.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ using android::StringPiece;
		namespace aapt {

		static ApiVersion sDevelopmentSdkLevel = 10000;
		static const auto sDevelopmentSdkCodeNames =
		std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});
		static const auto sDevelopmentSdkCodeNames = std::unordered_set<StringPiece>(
		{"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake", "VanillaIceCream"});

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