diff options
| author | 2020-12-07 14:12:20 +0000 | |
|---|---|---|
| committer | 2020-12-07 14:12:20 +0000 | |
| commit | dfe33cb7562a94bcbb9617eb6ec8b4762e7ec03a (patch) | |
| tree | b4f5f5289d95ee55df207f0460170b1693cae19d | |
| parent | 294dd8f1da16d03367e4af6f9fbf120e4d8674d5 (diff) | |
| parent | b755b613edf4d5c47eced040497f1ecca6bfb5d2 (diff) | |
Merge "Add VERSION_CODES constant for S"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b579d2cfc1db..3ac8c9aadd21 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -34461,6 +34461,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 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". */ |