commit 7beabc264b371be485b136319d54e3cfac75dc41
author Jeff Sharkey <jsharkey@android.com> Wed Jul 19 13:57:35 2017 -0600
committer Jeff Sharkey <jsharkey@google.com> Thu Jul 20 03:19:33 2017 +0000
tree 29ae2658f732033538f1a1ec2ec86749d5dff599
parent 1d47c55407f539d7d57ed16bd088de0a79a6ad82

Let's get a constant for O_MR1.

Test: none
Exempt-From-Owner-Approval: HULK SMASH!
Change-Id: I440ebae4d0891d9044bbbfb5beaaaa98639aea98

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index b77d3e6..dd8c3c6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30602,6 +30602,7 @@
     field public static final int N = 24; // 0x18
     field public static final int N_MR1 = 25; // 0x19
     field public static final int O = 26; // 0x1a
+    field public static final int O_MR1 = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 88d3e2c..be753c3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33341,6 +33341,7 @@
     field public static final int N = 24; // 0x18
     field public static final int N_MR1 = 25; // 0x19
     field public static final int O = 26; // 0x1a
+    field public static final int O_MR1 = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 5a6680f..890c118 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30713,6 +30713,7 @@
     field public static final int N = 24; // 0x18
     field public static final int N_MR1 = 25; // 0x19
     field public static final int O = 26; // 0x1a
+    field public static final int O_MR1 = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index a2fb9db..0541a53 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -759,6 +759,11 @@
          * O.
          */
         public static final int O = 26;
+
+        /**
+         * O MR1.
+         */
+        public static final int O_MR1 = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.
     }
 
     /** The type of build, like "user" or "eng". */

tools/aapt/SdkConstants.h

diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index d92de06..0dbf4ee 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -41,7 +41,8 @@
     SDK_MNC = 23,
     SDK_NOUGAT = 24,
     SDK_NOUGAT_MR1 = 25,
-    SDK_O = 26, // STOPSHIP replace with real version
+    SDK_O = 26,
+    SDK_O_MR1 = 10000, // STOPSHIP Replace with the real version.
 };
 
 #endif // H_AAPT_SDK_CONSTANTS

tools/aapt2/SdkConstants.h

diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index e3745e8..864e57d 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -52,6 +52,7 @@
   SDK_NOUGAT = 24,
   SDK_NOUGAT_MR1 = 25,
   SDK_O = 26,
+  SDK_O_MR1 = 10000, // STOPSHIP Replace with the real version.
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);