5 files changed, 6 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index 4c61afea3b59..e6434208dd4f 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 900659b5ae54..a5b7e995293a 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -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". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index 04fbbe1f1069..955581cf8655 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -46,6 +46,7 @@ enum {
     SDK_P = 28,
     SDK_Q = 29,
     SDK_R = 30,
+    SDK_S = 31,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS
diff --git a/tools/aapt2/SdkConstants.cpp b/tools/aapt2/SdkConstants.cpp
index e8873bf2d81b..96f6512fe7f5 100644
--- a/tools/aapt2/SdkConstants.cpp
+++ b/tools/aapt2/SdkConstants.cpp
@@ -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) {
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index aa9aa12d2cee..6bb6ddb13bdb 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -56,6 +56,7 @@ enum : ApiVersion {
   SDK_P = 28,
   SDK_Q = 29,
   SDK_R = 30,
+  SDK_S = 31,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);