diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2019-05-15 16:28:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-15 16:28:54 +0000 |
| commit | a326dfb1e550162e5091aee9d1336f2198c8bafc (patch) | |
| tree | 0e930806b1d9197caca5a778c666879028aef7df | |
| parent | c543db049d464e830a705183c48b5a9907d151f3 (diff) | |
| parent | 1912a57900025e8ed44063b7421b7d859540ab73 (diff) | |
Merge "Revert "Revert "Android Q is API 29""" into qt-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 3 | ||||
| -rw-r--r-- | tools/aapt/SdkConstants.h | 1 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.h | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 54fb459b3bc8..f0330e19de74 100644 --- a/api/current.txt +++ b/api/current.txt @@ -34166,7 +34166,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 3a4741a97212..1c9740728f1f 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 c1fcf5cad240..27ffcdf52168 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 9fa29f25c29c..580daabbd577 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); |