| commit | cb7520af40491a091ac4d5fe295471db48d33439 | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Thu Mar 18 23:32:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 18 23:32:04 2021 +0000 |
| tree | 6a4d8f175ae170fe8cc1edbdc074064e90914012 | |
| parent | 9f4d83aa3ef7f52dc46b2cdc0144340a049a7bef [diff] | |
| parent | 9a5ebe27681e4515508b0d39f44b940d50ad0ce3 [diff] |
Revert "Introduce derive_classpath service." am: c0e469a333 am: 008138b0f2 am: 9a5ebe2768 Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1645498 Change-Id: I1bdb23d14d656aba3397299af33c0af483e27de0
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 }