From 7beabc264b371be485b136319d54e3cfac75dc41 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 19 Jul 2017 13:57:35 -0600
Subject: [PATCH] Let's get a constant for O_MR1.

Test: none
Exempt-From-Owner-Approval: HULK SMASH!
Change-Id: I440ebae4d0891d9044bbbfb5beaaaa98639aea98
---
 api/current.txt                 | 1 +
 api/system-current.txt          | 1 +
 api/test-current.txt            | 1 +
 core/java/android/os/Build.java | 5 +++++
 tools/aapt/SdkConstants.h       | 3 ++-
 tools/aapt2/SdkConstants.h      | 1 +
 6 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index b77d3e6f6140c..dd8c3c61a96db 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -30602,6 +30602,7 @@ package android.os {
     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 {
diff --git a/api/system-current.txt b/api/system-current.txt
index 88d3e2c0b15b2..be753c32ecdb1 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -33341,6 +33341,7 @@ package android.os {
     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 {
diff --git a/api/test-current.txt b/api/test-current.txt
index 5a6680feff7da..890c118b1303f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -30713,6 +30713,7 @@ package android.os {
     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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index a2fb9db8c64bb..0541a53c24733 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -759,6 +759,11 @@ public class Build {
          * 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". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index d92de062bcf08..0dbf4ee8153e1 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -41,7 +41,8 @@ enum {
     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
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index e3745e8ce0dab..864e57d644a61 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -52,6 +52,7 @@ enum : ApiVersion {
   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);