diff options
| author | 2019-05-02 00:55:51 +0000 | |
|---|---|---|
| committer | 2019-05-02 00:55:51 +0000 | |
| commit | 60c71cee6ec064a0d2f4c6608fdb54bf95545d45 (patch) | |
| tree | 71336c3bb01c392225650472903967918b9f8647 | |
| parent | 8a3d1f96e1736c7e0493ebb71ed2904dffdebbfd (diff) | |
Revert "RESTRICT AUTOMERGE Android Q is API 29"
This reverts commit 8a3d1f96e1736c7e0493ebb71ed2904dffdebbfd.
Reason for revert: QT SDK Finalization. Will be merged again on/after May 13th
Bug: 131429032
Bug: 129975435
Change-Id: I7a48ef6a057a97ebd9903b7e934a7d95ec97f00e
| -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, 3 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index ee975296d761..9b8ea93f0a27 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 = 29; // 0x1d + field public static final int Q = 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 1c9740728f1f..3a4741a97212 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -976,7 +976,8 @@ 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 = 29; + public static final int Q = CUR_DEVELOPMENT; + } /** The type of build, like "user" or "eng". */ diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h index 27ffcdf52168..c1fcf5cad240 100644 --- a/tools/aapt/SdkConstants.h +++ b/tools/aapt/SdkConstants.h @@ -44,7 +44,6 @@ 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 580daabbd577..9fa29f25c29c 100644 --- a/tools/aapt2/SdkConstants.h +++ b/tools/aapt2/SdkConstants.h @@ -54,7 +54,6 @@ enum : ApiVersion { SDK_O = 26, SDK_O_MR1 = 27, SDK_P = 28, - SDK_Q = 29, }; ApiVersion FindAttributeSdkLevel(const ResourceId& id); |