| commit | 1b6fdb3702eaad5f1e2222f8f7933c244d70e1ea | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Mar 15 15:51:18 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 15 15:51:18 2021 +0000 |
| tree | cae3bb3e4ade1d577d2fb7e745621cf2e58485bb | |
| parent | a65d434226156e555329c088c900d67d3496b610 [diff] | |
| parent | 3fb4c6115fe778a88a61539a31e3fdb0ceb1bdd9 [diff] |
Merge "Symlink .clang-format to build/soong/scripts/system-clang-format-2." am: 82b8ba5ca0 am: 8947175b56 am: 3fb4c6115f Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1635839 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11e28c1fbeacf513e49f93d7e6e5ae91ce5fa286
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 }