| commit | 581828ef853e4877580d00811857861045e08428 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Mon Mar 01 16:03:46 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 16:03:46 2021 +0000 |
| tree | ba1888a15fd99a0a640db919d3d828bc5834e746 | |
| parent | 8aedc0e3dab85d1337eecb8242c888cc74eb6ab4 [diff] | |
| parent | 0c34cf76a68262d73bf5f7c12ffeada735ad2bec [diff] |
Verify S extension versions in end-to-end test am: 3d8cf38005 am: f393f09ff0 am: 0c34cf76a6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1608154 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I976df6070598d23ec9011faf37471ce56b34f981
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;