From b755b613edf4d5c47eced040497f1ecca6bfb5d2 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 30 Nov 2020 14:28:08 +0000
Subject: [PATCH] Add VERSION_CODES constant for S

This is a subset of the commit ed460aa1868e969880dd88a1ecef483de21ea34e
from internal master.

Note: The CL used for the Merged-in tag is irrelevant to this change but
achieves the desired automerging effects.

Test: No
Merged-In: If5c3b92063b8d9fb3f9b6272eb2cfef448065380
Change-Id: I205766a281eb3956c3d122f5358fe5c984803e6e
---
 core/api/current.txt            | 1 +
 core/java/android/os/Build.java | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/core/api/current.txt b/core/api/current.txt
index a20b58efb53fc..7be4e617f3092 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -34452,6 +34452,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
   }
 
   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 81213294361bf..3e77022d6bc1e 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1023,6 +1023,11 @@ public class Build {
          * R.
          */
         public static final int R = 30;
+
+        /**
+         * S.
+         */
+        public static final int S = CUR_DEVELOPMENT;
     }
 
     /** The type of build, like "user" or "eng". */