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

Commit c7ffdf8b authored Jan 18, 2023 by Colin Cross Committed by Steven Moreland Apr 07, 2023

Add VanillaIceCream to android.os.Build

Ignore-AOSP-First: UpsideDownCake Finalization

Note: added in U to avoid conflicts.

Bug: 264658905
Test: m checkbuild
Change-Id: I1b0a9d667cd481e91cfe473747a9ad38f77b4455
Merged-In: I1b0a9d667cd481e91cfe473747a9ad38f77b4455

parent 6b476d8b

core/api/current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32654,6 +32654,7 @@ package android.os {
	field public static final int S_V2 = 32; // 0x20		field public static final int S_V2 = 32; // 0x20
	field public static final int TIRAMISU = 33; // 0x21		field public static final int TIRAMISU = 33; // 0x21
	field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710		field public static final int UPSIDE_DOWN_CAKE = 10000; // 0x2710
			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 {		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	Original line	Diff line number	Diff line
	@@ -1223,6 +1223,11 @@ public class Build {
	* Upside Down Cake.		* Upside Down Cake.
	*/		*/
	public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;		public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;

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

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