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

Merge "Let's get a constant for O_MR1."

Browse Source
This commit is contained in:
Jeff Sharkey
2017-07-20 03:20:22 +00:00
committed by Android (Google) Code Review
parent bd77b8e920 7beabc264b
commit 6d626c24e3
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -30609,6 +30609,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 {

1
api/system-current.txt
View File

@@ -33419,6 +33419,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 {

1
api/test-current.txt
View File

@@ -30720,6 +30720,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 {

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

@@ -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". */

3
tools/aapt/SdkConstants.h
View File

@@ -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

1
tools/aapt2/SdkConstants.h
View File

@@ -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);