| commit | ae0e3c335f633c2db6d4da628907efb353af07c7 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Fri Feb 26 22:01:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 22:01:36 2021 +0000 |
| tree | cf3e350a1e74884da61d5ddcefcbefe8c06baecd | |
| parent | 88a34f2116fe699618ce9d89bf21d4821a2f6219 [diff] | |
| parent | 97caa8358c75c0b5c11e26074c5695fb65c7e046 [diff] |
Add end-to-end testing of extension-sdk attribute am: dfa3469bc8 am: 1315039986 am: 97caa8358c Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1608153 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifaa956db3ca3b0bc8efc14f0a7f7d8a96e7c8f23
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;