diff options
| author | Makoto Onuki <omakoto@google.com> | 2017-08-31 08:35:59 -0700 |
|---|---|---|
| committer | Michael Wright <michaelwr@google.com> | 2017-08-31 18:06:26 +0000 |
| commit | 7bd7a62336b013467d06f23290663fc3b4d1e37a (patch) | |
| tree | af9ec5b695e6445eacaaa798cbf9b8b1d75d44fd | |
| parent | 25706748aa867a9bd29fd2882c14e95167252517 (diff) | |
Add VERSION_CODES.P
Bug: 64982450
Test: Build and boot
Change-Id: I0a90033239081c583b10021cbc06d032e206beb4
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 5 | ||||
| -rw-r--r-- | tools/aapt/SdkConstants.h | 1 | ||||
| -rw-r--r-- | tools/aapt2/SdkConstants.h | 1 |
6 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 0ba052b742b9..9e68561c0f1f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30679,6 +30679,7 @@ package android.os { field public static final int N_MR1 = 25; // 0x19 field public static final int O = 26; // 0x1a field public static final int O_MR1 = 27; // 0x1b + field public static final int P = 10000; // 0x2710 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index 3e2eddb778a7..005e24d6ee1a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -33396,6 +33396,7 @@ package android.os { field public static final int N_MR1 = 25; // 0x19 field public static final int O = 26; // 0x1a field public static final int O_MR1 = 27; // 0x1b + field public static final int P = 10000; // 0x2710 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index 545d11c1a8ac..74bfb21e5a46 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -30823,6 +30823,7 @@ package android.os { field public static final int N_MR1 = 25; // 0x19 field public static final int O = 26; // 0x1a field public static final int O_MR1 = 27; // 0x1b + field public static final int P = 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 062799891ffd..935f5f3b78a7 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -774,6 +774,11 @@ public class Build { * O MR1. */ public static final int O_MR1 = 27; + + /** + * P. + */ + public static final int P = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version. } /** The type of build, like "user" or "eng". */ diff --git a/tools/aapt/SdkConstants.h b/tools/aapt/SdkConstants.h index bf56ec024699..b982d0d2ea63 100644 --- a/tools/aapt/SdkConstants.h +++ b/tools/aapt/SdkConstants.h @@ -43,6 +43,7 @@ enum { SDK_NOUGAT_MR1 = 25, SDK_O = 26, SDK_O_MR1 = 27, + SDK_P = 10000, // STOPSHIP Replace with the real version. }; #endif // H_AAPT_SDK_CONSTANTS diff --git a/tools/aapt2/SdkConstants.h b/tools/aapt2/SdkConstants.h index 5c32ed4fd849..13584c0bf840 100644 --- a/tools/aapt2/SdkConstants.h +++ b/tools/aapt2/SdkConstants.h @@ -53,6 +53,7 @@ enum : ApiVersion { SDK_NOUGAT_MR1 = 25, SDK_O = 26, SDK_O_MR1 = 27, + SDK_P = 10000, // STOPSHIP Replace with the real version. }; ApiVersion FindAttributeSdkLevel(const ResourceId& id); |