commit 8051c347e1876b90c6bd763ab01cbb0d746e1ea1
author David Brazdil <dbrazdil@google.com> Wed May 01 14:02:43 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 01 14:02:43 2019 +0000
tree e6a23eb3ce1c2c0443f924352b8c78a82f1479d6
parent b532966e8a096fec34aa23d6c786f7ce466a9489
parent 542991129eb01b5ba4a75ef468881b42c9a6a6dd

Merge "Add VersionCodes.Q"

dalvik/src/main/java/dalvik/system/VersionCodes.java

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;
 }

mmodules/core_platform_api/api/platform/current-api.txt

diff --git a/mmodules/core_platform_api/api/platform/current-api.txt b/mmodules/core_platform_api/api/platform/current-api.txt
index da717bd..939b3b4 100644
--- a/mmodules/core_platform_api/api/platform/current-api.txt
+++ b/mmodules/core_platform_api/api/platform/current-api.txt
@@ -769,6 +769,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 {

mmodules/intracoreapi/api/intra/current-api.txt

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