diff options
| author | 2024-11-29 15:14:39 +0100 | |
|---|---|---|
| committer | 2024-11-29 15:14:39 +0100 | |
| commit | 4d94fca58d35cbad08d6a386c0be34537e1aeffc (patch) | |
| tree | 59832b502e3628cf43b370b71340d5c29f24622a | |
| parent | b6c4db10d15e7de6b40d51029518b40b529c57ff (diff) | |
Guard minSdkVersionFull attribute with android.sdk.major_minor_versioning_scheme
The minSdkVersionFull changes were guarded by its own flag, but that
flag depended on android.sdk.major_minor_versioning_scheme. Since the
tooling doesn't support expressing dependencies between flags, change to
the old flag to avoid an illegal state where the new flag is enabled but
not the old one.
Bug: 371548304
Test: atest 'android.content.pm.parsing.cts.host.UsesSdkTest'
Flag: android.sdk.major_minor_versioning_scheme
Change-Id: I30f9f2b140700b95a226bb8a954e14fc1b75eaac
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public-staging.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index fd8e6102714a..d9338a579829 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -1203,7 +1203,7 @@ package android { field public static final int minResizeHeight = 16843670; // 0x1010396 field public static final int minResizeWidth = 16843669; // 0x1010395 field public static final int minSdkVersion = 16843276; // 0x101020c - field @FlaggedApi("android.content.pm.support_minor_versions_in_minsdkversion") public static final int minSdkVersionFull; + field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int minSdkVersionFull; field public static final int minWidth = 16843071; // 0x101013f field public static final int minimumHorizontalAngle = 16843901; // 0x101047d field public static final int minimumVerticalAngle = 16843902; // 0x101047e diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 08cb4de03536..00c59c6c0edc 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -2572,7 +2572,7 @@ against a development branch, in which case it will only work against the development builds. --> <attr name="minSdkVersion" format="integer|string" /> - <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) --> + <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) --> <attr name="minSdkVersionFull" format="string" /> <!-- This is the SDK version number that the application is targeting. It is able to run on older versions (down to minSdkVersion), but diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml index 778d9f9777b4..90f1b8a7046b 100644 --- a/core/res/res/values/public-staging.xml +++ b/core/res/res/values/public-staging.xml @@ -135,7 +135,7 @@ <public name="pageSizeCompat" /> <!-- @FlaggedApi(android.nfc.Flags.FLAG_NFC_ASSOCIATED_ROLE_SERVICES) --> <public name="shareRolePriority"/> - <!-- @FlaggedApi(android.content.pm.Flags.FLAG_SUPPORT_MINOR_VERSIONS_IN_MINSDKVERSION) --> + <!-- @FlaggedApi(android.sdk.Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME) --> <public name="minSdkVersionFull"/> </staging-public-group> |