commit | cb545c0f41330cebc2b20cef811c94c63f44d44c | [log] [tgz] |
---|---|---|
author | satayev <satayev@google.com> | Wed Mar 17 12:58:06 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 17 12:58:06 2021 +0000 |
tree | a3f88e12817f0bc6dd3e401c200af31496802ac8 | |
parent | 1b6fdb3702eaad5f1e2222f8f7933c244d70e1ea [diff] | |
parent | 5a42935af2d8c2429654cb70913a37df3fb32a40 [diff] |
Merge "Introduce derive_classpath service." am: 0cf5324f6a am: 6773b10778 am: 5a42935af2 Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1602413 Change-Id: I088dc6e14530614838341ac833f298cd02d7c6df
diff --git a/framework/java/android/os/ext/SdkExtensions.java b/framework/java/android/os/ext/SdkExtensions.java index 299a0d9..171eff8 100644 --- a/framework/java/android/os/ext/SdkExtensions.java +++ b/framework/java/android/os/ext/SdkExtensions.java
@@ -50,7 +50,7 @@ * Values suitable as parameters for {@link #getExtensionVersion(int)}. * @hide */ - @IntDef(value = { VERSION_CODES.R, VERSION_CODES.CUR_DEVELOPMENT }) + @IntDef(value = { VERSION_CODES.R, VERSION_CODES.S }) @Retention(RetentionPolicy.SOURCE) public @interface SdkVersion {} @@ -71,7 +71,7 @@ if (sdk == VERSION_CODES.R) { return R_EXTENSION_INT; } - if (sdk == VERSION_CODES.CUR_DEVELOPMENT) { + if (sdk == VERSION_CODES.S) { return S_EXTENSION_INT; } return 0;