commit | 88a34f2116fe699618ce9d89bf21d4821a2f6219 | [log] [tgz] |
---|---|---|
author | Anton Hansson <hansson@google.com> | Fri Feb 26 20:33:24 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 26 20:33:24 2021 +0000 |
tree | 5aabee7332ecafa8b6e7ec8157e33624bd9a2776 | |
parent | a089dd39bcfe7619736a50fb039aa27dbe1c58e3 [diff] | |
parent | 78e127837fecf4394d4426e040e87eeb24ec1267 [diff] |
Update the test_framework-sdkextensions prebuilt am: e185d23400 am: 642ddaf0c9 am: 78e127837f Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1607636 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I579d5865914d1512658f8d47f444de6e3ee8f2a6
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;
diff --git a/manifest.json b/manifest.json index deeb29e..7c089da 100644 --- a/manifest.json +++ b/manifest.json
@@ -1,4 +1,4 @@ { "name": "com.android.sdkext", - "version": 300000000 + "version": 309999900 }