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

Commit 7c5f4337 authored May 27, 2021 by Jeff Sharkey

platform/frameworks/base/ - S is now 31

Bug: 171506470
Test: Build
Change-Id: I46d4df5f27783a96a58c966b113391ea3bc112cb

parent 1dfd9484

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -30797,7 +30797,7 @@ package android.os {
		field public static final int P = 28; // 0x1c
		field public static final int Q = 29; // 0x1d
		field public static final int R = 30; // 0x1e
		field public static final int S = 10000; // 0x2710
		field public static final int S = 31; // 0x1f
		}

		public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1086,7 +1086,7 @@ public class Build {
		/**
		* S.
		*/
		public static final int S = CUR_DEVELOPMENT;
		public static final int S = 31;
		}

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

tools/aapt/SdkConstants.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@ enum {
		SDK_P = 28,
		SDK_Q = 29,
		SDK_R = 30,
		SDK_S = 31,
		};

		#endif // H_AAPT_SDK_CONSTANTS

tools/aapt2/SdkConstants.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,8 @@ static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {
		{0x056d, SDK_O_MR1},
		{0x0586, SDK_P},
		{0x0606, SDK_Q},
		{0x0617, SDK_R},
		{0x0616, SDK_R},
		{0x064b, SDK_S},
		};

		static bool less_entry_id(const std::pair<uint16_t, ApiVersion>& p, uint16_t entryId) {

tools/aapt2/SdkConstants.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ enum : ApiVersion {
		SDK_P = 28,
		SDK_Q = 29,
		SDK_R = 30,
		SDK_S = 31,
		};

		ApiVersion FindAttributeSdkLevel(const ResourceId& id);