summaryrefslogtreecommitdiff
path: root/core/java/android/os/Build.java
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-11-30 14:28:08 +0000
committerAnton Hansson <hansson@google.com>2020-11-30 16:14:29 +0000
commitb755b613edf4d5c47eced040497f1ecca6bfb5d2 (patch)
treee55fc22d7085da61f99bb3d2b35acac2997f65aa /core/java/android/os/Build.java
parent4450ca52cb1b1c654ad1460cff72aba0b43100b4 (diff)
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
Diffstat (limited to 'core/java/android/os/Build.java')
-rwxr-xr-xcore/java/android/os/Build.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 81213294361b..3e77022d6bc1 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". */