From 1912a57900025e8ed44063b7421b7d859540ab73 Mon Sep 17 00:00:00 2001
From: Ian Pedowitz <ijpedowitz@google.com>
Date: Sun, 12 May 2019 19:44:42 +0000
Subject: [PATCH] Revert "Revert "Android Q is API 29""

This reverts commit 60c71cee6ec064a0d2f4c6608fdb54bf95545d45.

Reason for revert: Rolling forward for Q-Finalization

Bug: 131429032
Bug: 129975435
Change-Id: Idd812d93b767d8a672b9ada58c8bcc2441395847
---
 api/current.txt                 | 2 +-
 core/java/android/os/Build.java | 3 +--
 tools/aapt/SdkConstants.h       | 1 +
 tools/aapt2/SdkConstants.h      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 9b8ea93f0a275..ee975296d7619 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34164,7 +34164,7 @@ package android.os {
     field public static final int O = 26; // 0x1a
     field public static final int O_MR1 = 27; // 0x1b
     field public static final int P = 28; // 0x1c
-    field public static final int Q = 10000; // 0x2710
+    field public static final int Q = 29; // 0x1d
   }
 
   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 3a4741a97212c..1c9740728f1fb 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -976,8 +976,7 @@ public class Build {
          * to come. Con permiso, Capitan. The hall is rented, the orchestra
          * engaged. It's now time to see if you can dance.</em>
          */
-        public static final int Q = CUR_DEVELOPMENT;
-
+        public static final int Q = 29;
     }
 
     /** The type of build, like "user" or "eng". */
diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h
index c1fcf5cad240b..27ffcdf52168f 100644
--- a/tools/aapt/SdkConstants.h
+++ b/tools/aapt/SdkConstants.h
@@ -44,6 +44,7 @@ enum {
     SDK_O = 26,
     SDK_O_MR1 = 27,
     SDK_P = 28,
+    SDK_Q = 29,
 };
 
 #endif // H_AAPT_SDK_CONSTANTS
diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h
index 9fa29f25c29c5..580daabbd5773 100644
--- a/tools/aapt2/SdkConstants.h
+++ b/tools/aapt2/SdkConstants.h
@@ -54,6 +54,7 @@ enum : ApiVersion {
   SDK_O = 26,
   SDK_O_MR1 = 27,
   SDK_P = 28,
+  SDK_Q = 29,
 };
 
 ApiVersion FindAttributeSdkLevel(const ResourceId& id);