summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
-rw-r--r--api/test-current.txt1
-rw-r--r--core/java/android/os/Build.java5
4 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 05427cb34f46..4920cb20cbf8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28463,6 +28463,7 @@ package android.os {
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
+ field public static final int O = 10000; // 0x2710
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/api/system-current.txt b/api/system-current.txt
index a023680f124b..cda9dc2958db 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30953,6 +30953,7 @@ package android.os {
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
+ field public static final int O = 10000; // 0x2710
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/api/test-current.txt b/api/test-current.txt
index fdff82d2e538..03881930cf39 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -28536,6 +28536,7 @@ package android.os {
field public static final int M = 23; // 0x17
field public static final int N = 24; // 0x18
field public static final int N_MR1 = 25; // 0x19
+ field public static final int O = 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 312a0984ca54..e5832c8064d3 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -755,6 +755,11 @@ public class Build {
* N MR1: Nougat++.
*/
public static final int N_MR1 = 25;
+
+ /**
+ * O.
+ */
+ public static final int O = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
}
/** The type of build, like "user" or "eng". */