O is API 26

Bug: 37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1

diff --git a/api/current.txt b/api/current.txt
index 899381b..157a72c 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -30508,7 +30508,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
+    field public static final int O = 26; // 0x1a
   }
 
   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 8aa6c36..110d1dd 100644 (file)
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33218,7 +33218,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
+    field public static final int O = 26; // 0x1a
   }
 
   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 944a350..ef2fce7 100644 (file)
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30617,7 +30617,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
+    field public static final int O = 26; // 0x1a
   }
 
   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 86fcfc8..4bad7ab 100644 (file)
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -758,7 +758,7 @@ public class Build {
         /**
          * O.
          */
-        public static final int O = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
+        public static final int O = 26;
     }
 
     /** The type of build, like "user" or "eng". */