commit | eb7a273cdae74df85612b4f011be42c31fc93da5 | [log] [tgz] |
---|---|---|
author | Orion Hodson <oth@google.com> | Fri Jul 02 17:07:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 02 17:07:25 2021 +0000 |
tree | 62d047d94226790f03c46cec03f7d54d62793aaf | |
parent | 13e8dd868a047193ee253bf8e0c9152c92189e3a [diff] | |
parent | 7efd2b930167d6d13bd2a2f357f53cc04884f49f [diff] |
Update version code definitions am: 7efd2b9301 Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/15106958 Change-Id: I5981cd16aeac4b9fbc57a0baeb895f8dcb1491ff
diff --git a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java index c05ce06..9d4d3fa 100644 --- a/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java +++ b/dalvik/src/main/java/dalvik/annotation/compat/VersionCodes.java
@@ -67,8 +67,8 @@ public static final int R = 30; /** - * The version code for Android S (API version TBD). + * The version code for Android S (API version 31). */ @IntraCoreApi - public static final int S = CUR_DEVELOPMENT; + public static final int S = 31; }
diff --git a/mmodules/intracoreapi/api/intra/current.txt b/mmodules/intracoreapi/api/intra/current.txt index bc021cf..7e813f9 100644 --- a/mmodules/intracoreapi/api/intra/current.txt +++ b/mmodules/intracoreapi/api/intra/current.txt
@@ -35,7 +35,7 @@ field @libcore.api.IntraCoreApi public static final int P = 28; // 0x1c field @libcore.api.IntraCoreApi public static final int Q = 29; // 0x1d field @libcore.api.IntraCoreApi public static final int R = 30; // 0x1e - field @libcore.api.IntraCoreApi public static final int S = 10000; // 0x2710 + field @libcore.api.IntraCoreApi public static final int S = 31; // 0x1f } }