Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Android Q is API 29""" into qt-dev

Browse Source
This commit is contained in:
Ian Pedowitz
2019-05-15 16:28:54 +00:00
committed by Android (Google) Code Review
parent c543db049d 1912a57900
commit a326dfb1e5
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -34166,7 +34166,7 @@ package android.os {
field public static final int O = 26; // 0x1a field public static final int O = 26; // 0x1a
field public static final int O_MR1 = 27; // 0x1b field public static final int O_MR1 = 27; // 0x1b
field public static final int P = 28; // 0x1c 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

3
core/java/android/os/Build.java
View File

@@ -976,8 +976,7 @@ public class Build {
* to come. Con permiso, Capitan. The hall is rented, the orchestra * to come. Con permiso, Capitan. The hall is rented, the orchestra
* engaged. It's now time to see if you can dance.</em> * 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". */ /** The type of build, like "user" or "eng". */

1
tools/aapt/SdkConstants.h
View File

@@ -44,6 +44,7 @@ enum {
SDK_O = 26, SDK_O = 26,
SDK_O_MR1 = 27, SDK_O_MR1 = 27,
SDK_P = 28, SDK_P = 28,
SDK_Q = 29,
}; };
#endif // H_AAPT_SDK_CONSTANTS #endif // H_AAPT_SDK_CONSTANTS

1
tools/aapt2/SdkConstants.h
View File

@@ -54,6 +54,7 @@ enum : ApiVersion {
SDK_O = 26, SDK_O = 26,
SDK_O_MR1 = 27, SDK_O_MR1 = 27,
SDK_P = 28, SDK_P = 28,
SDK_Q = 29,
}; };
ApiVersion FindAttributeSdkLevel(const ResourceId& id); ApiVersion FindAttributeSdkLevel(const ResourceId& id);