Merge "Upstream partner request to add BC methods to core platform API."
diff --git a/dalvik/src/main/java/dalvik/system/VersionCodes.java b/dalvik/src/main/java/dalvik/system/VersionCodes.java
index 670db0f..b20af83 100644
--- a/dalvik/src/main/java/dalvik/system/VersionCodes.java
+++ b/dalvik/src/main/java/dalvik/system/VersionCodes.java
@@ -50,4 +50,11 @@
@CorePlatformApi
@IntraCoreApi
public static final int P = 28;
+
+ /**
+ * The version code for Android Q (API version 29).
+ */
+ @CorePlatformApi
+ @IntraCoreApi
+ public static final int Q = 29;
}
diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index a727f46..5c65eb8 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -842,6 +842,7 @@
public class VersionCodes {
field public static final int O = 26; // 0x1a
field public static final int P = 28; // 0x1c
+ field public static final int Q = 29; // 0x1d
}
public final class ZygoteHooks {
diff --git a/mmodules/intracoreapi/api/intra/current-api.txt b/mmodules/intracoreapi/api/intra/current-api.txt
index 9780457..5319009 100644
--- a/mmodules/intracoreapi/api/intra/current-api.txt
+++ b/mmodules/intracoreapi/api/intra/current-api.txt
@@ -426,6 +426,7 @@
@libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public class VersionCodes {
field @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static final int O = 26; // 0x1a
field @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static final int P = 28; // 0x1c
+ field @libcore.api.CorePlatformApi @libcore.api.IntraCoreApi public static final int Q = 29; // 0x1d
}
}