Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add VERSION_CODES constant for S" am: dfe33cb756 am: 230a340757

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513731

Change-Id: I3ead6dc8599c4327b15138de931bd3c8392f8953
This commit is contained in:
Anton Hansson
2020-12-07 17:33:37 +00:00
committed by Automerger Merge Worker
parent e33396e4c6 230a340757
commit 60fc6b2406
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -34461,6 +34461,7 @@ package android.os {
field public static final int P = 28; // 0x1c field public static final int P = 28; // 0x1c
field public static final int Q = 29; // 0x1d field public static final int Q = 29; // 0x1d
field public static final int R = 30; // 0x1e 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

5
core/java/android/os/Build.java
View File

@@ -1041,6 +1041,11 @@ public class Build {
* *
*/ */
public static final int R = 30; public static final int R = 30;
/**
* S.
*/
public static final int S = CUR_DEVELOPMENT;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */