From 4723893609cfb4d03bb79de8b0be8bd5a40b9c45 Mon Sep 17 00:00:00 2001
From: Jonathan Pryor <jonpryor@vt.edu>
Date: Fri, 14 Aug 2026 15:37:36 -0400
Subject: [PATCH 1/3] [Mono.Android] Enumify, stabilize API-37.1

Context: http://github.com/jpobst/BindingStudio
Context: https://github.com/dotnet/android/pull/10005

Use jpobst/BindingStudio to enumify API-37.1.

Note: current dotnet/java-interop emits an "extra" `,` on `map.csv`
output, which would make for a "noisy" diff (every line changed!).
The diff size is reduced by removing trailing commas:

	tr -d '\r' < src/Mono.Android/map.csv > src/Mono.Android/new-map.csv
	sed 's/,$//' < src/Mono.Android/new-map.csv > src/Mono.Android/map.csv

This keeps the diff to a reasonable size.

Sanity check: during enumification, this should have no matches:

	git grep '\.[A-Z][a-z]\.' src/Mono.Android/map.csv

Two-letter namespace parts should be all upper-case.

TODO (lol): update `map.csv` to current BindingStudio output after
this is merged.
---
 Configuration.props                           |    9 +-
 Documentation/workflow/HowToAddNewApiLevel.md |   10 +-
 .../CheckApiCompatibility.cs                  |    3 +-
 .../manifest-attribute-codegen/README.md      |   37 +
 .../manifest-definition.xml                   | 1173 +++++++++--------
 .../manifest-attribute-codegen/metadata.xml   |   20 +-
 .../Mono.Android.Runtime.csproj               |    7 +-
 src/Mono.Android/Mono.Android.Apis.projitems  |    2 +-
 src/Mono.Android/map.csv                      |  108 ++
 src/Mono.Android/methodmap.csv                |   16 +
 10 files changed, 801 insertions(+), 584 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index 16c7932f302..c6f829d80d2 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -24,12 +24,11 @@
     <AndroidLatestStableApiLevel Condition="'$(AndroidLatestStableApiLevel)' == ''">37</AndroidLatestStableApiLevel>
     <AndroidLatestStablePlatformId Condition="'$(AndroidLatestStablePlatformId)' == ''">37.0</AndroidLatestStablePlatformId>
     <AndroidLatestStableFrameworkVersion Condition="'$(AndroidLatestStableFrameworkVersion)'==''">v17.0</AndroidLatestStableFrameworkVersion>
-    <!-- If there is a second *stable* API level (e.g. 38.1 alongside 38), set it here:
-    <AndroidLatestStableApiLevel2 Condition="'$(AndroidLatestStableApiLevel2)' == ''">38.1</AndroidLatestStableApiLevel2>
-    -->
+    <!-- If there is a second *stable* API level (e.g. 38.1 alongside 38), set it here: -->
+    <AndroidLatestStableApiLevel2 Condition="'$(AndroidLatestStableApiLevel2)' == ''">37.1</AndroidLatestStableApiLevel2>
     <!-- *Latest* *unstable* API level binding that we support; this can be the same as *stable* -->
-    <AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">37.1</AndroidLatestUnstableApiLevel>
-    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">37.1</AndroidLatestUnstablePlatformId>
+    <AndroidLatestUnstableApiLevel Condition="'$(AndroidLatestUnstableApiLevel)' == ''">$(AndroidLatestStableApiLevel2)</AndroidLatestUnstableApiLevel>
+    <AndroidLatestUnstablePlatformId Condition="'$(AndroidLatestUnstablePlatformId)' == ''">$(AndroidLatestStableApiLevel2)</AndroidLatestUnstablePlatformId>
     <AndroidLatestUnstableFrameworkVersion Condition="'$(AndroidLatestUnstableFrameworkVersion)'==''">v17.1</AndroidLatestUnstableFrameworkVersion>
     <!-- The default API level used for $(TargetPlatformVersion) -->
     <AndroidDefaultTargetDotnetApiLevel Condition=" '$(AndroidDefaultTargetDotnetApiLevel)' == '' ">$(AndroidLatestStableApiLevel)</AndroidDefaultTargetDotnetApiLevel>
diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
index ee49a7bc772..1303b1f2b4f 100644
--- a/Documentation/workflow/HowToAddNewApiLevel.md
+++ b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -547,7 +547,15 @@ the `csv` variable within `MainForm.FindAPILevelMethodsToolStripMenuItem_Click`.
 Once this process is complete, use `Tools` -> `Export Final Method Map`, and create a *new*
 `.csv` file, e.g. `new-methodmap.csv`.
 
-Copy the contents of `new-methodmap.csv` and *append* to `src/Mono.Android/methodmap.csv`.
+Note: `new-methodmap.csv` will likely use JNI syntax for package names, e.g. `android/widget`.
+`methodmap.csv` ***must*** use *Java* syntax for package names, e.g. `android.widget`.
+Use **sed**(1) to fix package names and nested class names:
+
+```sh
+sed 's,/,.,g;s/\$/./g' < src/Mono.Android/new-methodmap.csv > src/Mono.Android/new-methodmap2.csv
+```
+
+Copy the contents of `new-methodmap2.csv` and *append* to `src/Mono.Android/methodmap.csv`.
 
 There may be redundant duplicate entries within `methodmap.csv`.  Use the **uniq**(1)
 Unix app to remove duplicate entries.
diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs
index 44e726086be..0d2cb04598c 100644
--- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs
+++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/CheckApiCompatibility.cs
@@ -80,7 +80,8 @@ public override bool Execute ()
 
 			// Check to see if Api has a previous Api defined.
 			if (!api_versions.TryGetValue (ApiLevel, out string previousApiLevel)) {
-				LogError ($"Please add ApiLevel:{ApiLevel} to the list of supported apis.");
+				LogError ($"Please add ApiLevel:{ApiLevel} to the list of supported apis. Supported APIs include: " +
+					string.Join (", ", api_versions.Keys.OrderBy (k => k)) + ".");
 				return !Log.HasLoggedErrors;
 			}
 
diff --git a/build-tools/manifest-attribute-codegen/README.md b/build-tools/manifest-attribute-codegen/README.md
index e17ff3a81a9..167cd806276 100644
--- a/build-tools/manifest-attribute-codegen/README.md
+++ b/build-tools/manifest-attribute-codegen/README.md
@@ -47,12 +47,14 @@ These represent valid instances of entries and attributes respectively that can
 For example, consider the following valid `AndroidManifest.xml` entry:
 
 ```xml
+<!-- app AndroidManifest.xml, possibly generated -->
 <activity name="MyActivity" />
 ```
 
 This is partially declared within the Android SDK `attrs_manifest.xml` as:
 
 ```xml
+<!-- in $ANDROID_SDK_HOME/platforms/android-*/data/res/values/attrs_manifest.xml -->
 <declare-styleable name="AndroidManifestActivity" parent="AndroidManifestApplication">
     <attr name="name" />
 </declare-styleable>
@@ -64,6 +66,7 @@ The `<activity name="…"/>` element is represented in `metadata.xml` via both a
 and an `<element/>` entry:
 
 ```xml
+<!-- build-tools/manifest-attribute-codegen/metadata.xml -->
 <type name="activity" namespace="Android.App" outputFile="src\Xamarin.Android.NamingCustomAttributes\Android.App\ActivityAttribute.cs" usage="AttributeTargets.Class" jniNameProvider="true" />
 <element path="activity.name" visible="true" />
 ```
@@ -146,3 +149,37 @@ Optional metadata (note that if any metadata is set, `visible` is assumed to be
 - **obsolete** - A string describing the reason for this member being `[Obsolete ("reason")]`
 - **readonly** - Whether to generate the property with a `private set`; defaults to `false`
 - **manualMap** - Whether to exclude the property from the `mapping` field used by `Xamarin.Android.Build.Tasks`; defaults to `false`
+
+# Examples
+
+Running the `GenerateManifestAttributes` target emits a message such as:
+
+```
+warning - Element: application.backupAgentProcess
+```
+
+The first question: is this *documented*?  View the
+[Google documentation for `<application>`](https://developer.android.com/guide/topics/manifest/application-element),
+which -- at this writing on 2026-Aug-17 -- is ***not*** documented.
+Consequently, we should ignore it, by updating `metadata.xml` to contain:
+
+```xml
+<element path="application.backupAgentProcess" visible="false" />
+```
+
+Running the `GenerateManifestAttributes` target emits a message such as:
+
+```
+warning - Type: <valid-general-purpose>
+```
+
+Similar but different to the `Element: application.backupAgentProcess` message:
+a *Type* is an XML element, not an attribute on an XML element.  As such, we would look at the
+[App manifest overview](https://developer.android.com/guide/topics/manifest/manifest-intro)
+documentation to see if *type* is mentioned in the left-hand sidebar to see if the element
+is documented.  At this writing on 2026-Aug-17, ***no*** `<valid-general-purpose>` element is
+documented, and thus the Type (element) should be hidden by updating `metadata.xml` to contain:
+
+```xml
+<type name="valid-general-purpose" ignore="true" />
+```
diff --git a/build-tools/manifest-attribute-codegen/manifest-definition.xml b/build-tools/manifest-attribute-codegen/manifest-definition.xml
index 7e0cab91711..144ec459b04 100644
--- a/build-tools/manifest-attribute-codegen/manifest-definition.xml
+++ b/build-tools/manifest-attribute-codegen/manifest-definition.xml
@@ -1,391 +1,510 @@
 <m>
-    <e name='manifest' api-level='10'>
-        <a name='versionCode' />
-        <a name='versionName' />
-        <a name='sharedUserId' />
-        <a name='sharedUserLabel' />
-        <a name='installLocation' />
-        <a name='revisionCode' api-level='22' />
-        <a name='isolatedSplits' api-level='26' />
-        <a name='isFeatureSplit' api-level='26' />
-        <a name='targetSandboxVersion' api-level='26' />
-        <a name='versionCodeMajor' api-level='28' />
-        <a name='compileSdkVersion' api-level='28' />
-        <a name='compileSdkVersionCodename' api-level='28' />
-        <a name='isSplitRequired' api-level='29' />
-        <a name='sharedUserMaxSdkVersion' api-level='33' />
-        <a name='requiredSplitTypes' api-level='33' />
-        <a name='splitTypes' api-level='33' />
-    </e>
-    <e name='application' api-level='10'>
+    <e name='manifest' api-level='35'>
+        <a name='versionCode' api-level='35' />
+        <a name='versionCodeMajor' api-level='35' />
+        <a name='versionName' api-level='35' />
+        <a name='revisionCode' api-level='35' />
+        <a name='sharedUserId' api-level='35' />
+        <a name='sharedUserLabel' api-level='35' />
+        <a name='sharedUserMaxSdkVersion' api-level='35' />
+        <a name='installLocation' api-level='35' />
+        <a name='isolatedSplits' api-level='35' />
+        <a name='isFeatureSplit' api-level='35' />
+        <a name='targetSandboxVersion' api-level='35' />
+        <a name='compileSdkVersion' api-level='35' />
+        <a name='compileSdkVersionCodename' api-level='35' />
+        <a name='isSplitRequired' api-level='35' />
+        <a name='requiredSplitTypes' api-level='35' />
+        <a name='splitTypes' api-level='35' />
+    </e>
+    <e name='application' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='theme' />
-        <a name='label' />
-        <a name='icon' />
-        <a name='description' />
-        <a name='permission' />
-        <a name='process' />
-        <a name='taskAffinity' />
-        <a name='allowTaskReparenting' />
-        <a name='hasCode' format='boolean' />
-        <a name='persistent' />
-        <a name='enabled' />
-        <a name='debuggable' />
-        <a name='vmSafeMode' />
-        <a name='manageSpaceActivity' />
-        <a name='allowClearUserData' />
-        <a name='testOnly' />
-        <a name='backupAgent' />
-        <a name='allowBackup' />
-        <a name='killAfterRestore' />
-        <a name='restoreNeedsApplication' />
-        <a name='restoreAnyVersion' />
-        <a name='neverEncrypt' />
-        <a name='cantSaveState' format='boolean' />
-        <a name='logo' api-level='15' />
-        <a name='hardwareAccelerated' api-level='15' />
-        <a name='largeHeap' format='boolean' api-level='15' />
-        <a name='uiOptions' api-level='15' />
-        <a name='supportsRtl' format='boolean' api-level='16' />
-        <a name='requiredForAllUsers' api-level='18' />
-        <a name='restrictedAccountType' format='string' api-level='18' />
-        <a name='requiredAccountType' format='string' api-level='18' />
-        <a name='banner' api-level='20' />
-        <a name='isGame' api-level='20' />
-        <a name='fullBackupOnly' api-level='21' />
-        <a name='multiArch' api-level='21' />
-        <a name='fullBackupContent' api-level='23' />
-        <a name='usesCleartextTraffic' api-level='23' />
-        <a name='extractNativeLibs' api-level='23' />
-        <a name='backupInForeground' api-level='24' />
-        <a name='defaultToDeviceProtectedStorage' format='boolean' api-level='24' />
-        <a name='directBootAware' api-level='24' />
-        <a name='resizeableActivity' api-level='24' />
-        <a name='networkSecurityConfig' api-level='24' />
-        <a name='roundIcon' api-level='25' />
-        <a name='persistentWhenFeatureAvailable' api-level='26' />
-        <a name='maxAspectRatio' api-level='26' />
-        <a name='appCategory' api-level='26' />
-        <a name='classLoader' api-level='27' />
-        <a name='appComponentFactory' api-level='28' />
-        <a name='useEmbeddedDex' api-level='29' />
-        <a name='minAspectRatio' api-level='29' />
-        <a name='usesNonSdkApi' api-level='29' />
-        <a name='hasFragileUserData' format='boolean' api-level='29' />
-        <a name='zygotePreloadName' api-level='29' />
-        <a name='allowClearUserDataOnFailedRestore' format='boolean' api-level='29' />
-        <a name='allowAudioPlaybackCapture' format='boolean' api-level='29' />
-        <a name='requestLegacyExternalStorage' format='boolean' api-level='29' />
-        <a name='preserveLegacyExternalStorage' format='boolean' api-level='30' />
-        <a name='forceQueryable' format='boolean' api-level='30' />
-        <a name='crossProfile' format='boolean' api-level='30' />
-        <a name='allowNativeHeapPointerTagging' format='boolean' api-level='30' />
-        <a name='gwpAsanMode' api-level='30' />
-        <a name='allowAutoRevokePermissionsExemption' format='boolean' api-level='30' />
-        <a name='autoRevokePermissions' api-level='30' />
-        <a name='requestRawExternalStorageAccess' format='boolean' api-level='31' />
-        <a name='memtagMode' api-level='31' />
-        <a name='nativeHeapZeroInitialized' format='boolean' api-level='31' />
-        <a name='rollbackDataPolicy' api-level='31' />
-        <a name='dataExtractionRules' format='reference' api-level='31' />
-        <a name='requestForegroundServiceExemption' format='boolean' api-level='31' />
-        <a name='attributionsAreUserVisible' format='boolean' api-level='31' />
-        <a name='localeConfig' api-level='33' />
-        <a name='resetEnabledSettingsOnAppDataCleared' format='boolean' api-level='33' />
-        <a name='knownActivityEmbeddingCerts' api-level='33' />
-        <a name='enableOnBackInvokedCallback' format='boolean' api-level='33' />
+        <a name='name' api-level='35' />
+        <a name='theme' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='process' api-level='35' />
+        <a name='taskAffinity' api-level='35' />
+        <a name='allowTaskReparenting' api-level='35' />
+        <a name='hasCode' format='boolean' api-level='35' />
         <a name='allowCrossUidActivitySwitchFromBelow' format='boolean' api-level='35' />
+        <a name='persistent' api-level='35' />
+        <a name='persistentWhenFeatureAvailable' api-level='35' />
+        <a name='requiredForAllUsers' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='debuggable' api-level='35' />
+        <a name='vmSafeMode' api-level='35' />
+        <a name='hardwareAccelerated' api-level='35' />
+        <a name='manageSpaceActivity' api-level='35' />
+        <a name='allowClearUserData' api-level='35' />
+        <a name='testOnly' api-level='35' />
+        <a name='backupAgent' api-level='35' />
+        <a name='allowBackup' api-level='35' />
+        <a name='fullBackupOnly' api-level='35' />
+        <a name='fullBackupContent' api-level='35' />
+        <a name='killAfterRestore' api-level='35' />
+        <a name='restoreNeedsApplication' api-level='35' />
+        <a name='restoreAnyVersion' api-level='35' />
+        <a name='backupInForeground' api-level='35' />
+        <a name='largeHeap' format='boolean' api-level='35' />
+        <a name='cantSaveState' format='boolean' api-level='35' />
+        <a name='uiOptions' api-level='35' />
+        <a name='supportsRtl' format='boolean' api-level='35' />
+        <a name='restrictedAccountType' format='string' api-level='35' />
+        <a name='requiredAccountType' format='string' api-level='35' />
+        <a name='isGame' api-level='35' />
+        <a name='usesCleartextTraffic' api-level='35' />
+        <a name='multiArch' api-level='35' />
+        <a name='useEmbeddedDex' api-level='35' />
+        <a name='extractNativeLibs' api-level='35' />
+        <a name='defaultToDeviceProtectedStorage' format='boolean' api-level='35' />
+        <a name='directBootAware' api-level='35' />
+        <a name='resizeableActivity' api-level='35' />
+        <a name='maxAspectRatio' api-level='35' />
+        <a name='minAspectRatio' api-level='35' />
+        <a name='networkSecurityConfig' api-level='35' />
+        <a name='localeConfig' api-level='35' />
+        <a name='appCategory' api-level='35' />
+        <a name='classLoader' api-level='35' />
+        <a name='appComponentFactory' api-level='35' />
+        <a name='usesNonSdkApi' api-level='35' />
+        <a name='hasFragileUserData' format='boolean' api-level='35' />
+        <a name='zygotePreloadName' api-level='35' />
+        <a name='allowClearUserDataOnFailedRestore' format='boolean' api-level='35' />
+        <a name='allowAudioPlaybackCapture' format='boolean' api-level='35' />
+        <a name='requestLegacyExternalStorage' format='boolean' api-level='35' />
+        <a name='preserveLegacyExternalStorage' format='boolean' api-level='35' />
+        <a name='requestRawExternalStorageAccess' format='boolean' api-level='35' />
+        <a name='forceQueryable' format='boolean' api-level='35' />
+        <a name='crossProfile' format='boolean' api-level='35' />
+        <a name='allowNativeHeapPointerTagging' format='boolean' api-level='35' />
+        <a name='gwpAsanMode' api-level='35' />
+        <a name='memtagMode' api-level='35' />
+        <a name='nativeHeapZeroInitialized' format='boolean' api-level='35' />
+        <a name='allowAutoRevokePermissionsExemption' format='boolean' api-level='35' />
+        <a name='autoRevokePermissions' api-level='35' />
+        <a name='rollbackDataPolicy' api-level='35' />
+        <a name='dataExtractionRules' format='reference' api-level='35' />
+        <a name='requestForegroundServiceExemption' format='boolean' api-level='35' />
+        <a name='attributionsAreUserVisible' format='boolean' api-level='35' />
+        <a name='resetEnabledSettingsOnAppDataCleared' format='boolean' api-level='35' />
+        <a name='knownActivityEmbeddingCerts' api-level='35' />
+        <a name='enableOnBackInvokedCallback' format='boolean' api-level='35' />
         <a name='pageSizeCompat' api-level='36.1' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='alternateLauncherIcons' format='reference' api-level='36.1' />
         <a name='alternateLauncherLabels' format='reference' api-level='36.1' />
+        <a name='backupAgentProcess' api-level='37.0' />
+        <a name='zygotePreloadNativeLib' api-level='37.0' />
+        <a name='zygotePreloadNativeFunc' api-level='37.0' />
+    </e>
+    <e name='attribution' api-level='35'>
+        <parent>manifest</parent>
+        <a name='tag' format='string' api-level='35' />
+        <a name='label' format='string' api-level='35' />
+    </e>
+    <e name='attribution-inherit-from' api-level='35'>
+        <parent>attribution</parent>
+        <a name='tag' format='string' api-level='35' />
     </e>
-    <e name='permission' api-level='10'>
+    <e name='permission' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='icon' />
-        <a name='permissionGroup' />
-        <a name='description' />
-        <a name='protectionLevel' />
-        <a name='logo' api-level='15' />
-        <a name='permissionFlags' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='roundIcon' api-level='25' />
-        <a name='request' api-level='28' />
-        <a name='backgroundPermission' format='string' api-level='29' />
-        <a name='knownCerts' api-level='31' />
-        <a name='maxSdkVersion' api-level='34' />
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='permissionGroup' api-level='35' />
+        <a name='backgroundPermission' format='string' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='request' api-level='35' />
+        <a name='protectionLevel' api-level='35' />
+        <a name='permissionFlags' api-level='35' />
+        <a name='knownCerts' api-level='35' />
+        <a name='maxSdkVersion' api-level='35' />
         <a name='requiresPurpose' format='boolean' api-level='36.1' />
         <a name='requiresPurposeTargetSdkVersion' format='integer' api-level='36.1' />
+        <a name='requiresGeneralPurposeTargetSdkVersion' format='integer' api-level='37.0' />
+        <a name='requiresPurposeStringTargetSdkVersion' format='integer' api-level='37.0' />
     </e>
-    <e name='permission-group' api-level='10'>
+    <e name='permission-group' api-level='35'>
+        <parent>manifest</parent>
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='request' format='string' api-level='35' />
+        <a name='requestDetail' format='string' api-level='35' />
+        <a name='backgroundRequest' format='string' api-level='35' />
+        <a name='backgroundRequestDetail' format='string' api-level='35' />
+        <a name='permissionGroupFlags' api-level='35' />
+        <a name='priority' api-level='35' />
+    </e>
+    <e name='permission-tree' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='icon' />
-        <a name='description' />
-        <a name='logo' api-level='15' />
-        <a name='priority' api-level='16' />
-        <a name='permissionGroupFlags' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='roundIcon' api-level='25' />
-        <a name='request' api-level='28' />
-        <a name='requestDetail' format='string' api-level='29' />
-        <a name='backgroundRequest' format='string' api-level='29' />
-        <a name='backgroundRequestDetail' format='string' api-level='29' />
-    </e>
-    <e name='permission-tree' api-level='10'>
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+    </e>
+    <e name='uses-permission' api-level='35'>
+        <parent>manifest</parent>
+        <a name='name' api-level='35' />
+        <a name='minSdkVersion' format='integer|string' api-level='35' />
+        <a name='maxSdkVersion' format='integer' api-level='35' />
+        <a name='requiredFeature' format='string' api-level='35' />
+        <a name='requiredNotFeature' format='string' api-level='35' />
+        <a name='usesPermissionFlags' api-level='35' />
+        <a name='purposeString' format='reference' api-level='37.0' />
+    </e>
+    <e name='required-feature' api-level='35'>
+        <a name='name' api-level='35' />
+    </e>
+    <e name='required-not-feature' api-level='35'>
+        <a name='name' api-level='35' />
+    </e>
+    <e name='uses-configuration' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='icon' />
-        <a name='logo' api-level='15' />
-        <a name='banner' api-level='20' />
-        <a name='roundIcon' api-level='25' />
-    </e>
-    <e name='uses-permission' api-level='10'>
+        <a name='reqTouchScreen' api-level='35' />
+        <a name='reqKeyboardType' api-level='35' />
+        <a name='reqHardKeyboard' api-level='35' />
+        <a name='reqNavigation' api-level='35' />
+        <a name='reqFiveWayNav' api-level='35' />
+    </e>
+    <e name='uses-feature' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='maxSdkVersion' format='integer' api-level='19' />
-        <a name='requiredFeature' format='string' api-level='26' />
-        <a name='requiredNotFeature' format='string' api-level='26' />
-        <a name='usesPermissionFlags' api-level='31' />
-        <a name='minSdkVersion' format='integer|string' api-level='34' />
-    </e>
-    <e name='uses-configuration' api-level='10'>
+        <a name='name' api-level='35' />
+        <a name='version' format='integer' api-level='35' />
+        <a name='glEsVersion' format='integer' api-level='35' />
+        <a name='required' format='boolean' api-level='35' />
+    </e>
+    <e name='feature-group' api-level='35'>
+        <a name='label' api-level='35' />
+    </e>
+    <e name='uses-sdk' api-level='35'>
         <parent>manifest</parent>
-        <a name='reqTouchScreen' />
-        <a name='reqKeyboardType' />
-        <a name='reqHardKeyboard' />
-        <a name='reqNavigation' />
-        <a name='reqFiveWayNav' />
+        <a name='minSdkVersion' format='integer|string' api-level='35' />
+        <a name='targetSdkVersion' format='integer|string' api-level='35' />
+        <a name='maxSdkVersion' api-level='35' />
+    </e>
+    <e name='extension-sdk' api-level='35'>
+        <a name='sdkVersion' format='integer' api-level='35' />
+        <a name='minExtensionVersion' format='integer' api-level='35' />
     </e>
-    <e name='uses-feature' api-level='10'>
+    <e name='library' api-level='35'>
         <parent>manifest</parent>
-        <a name='glEsVersion' format='integer' />
-        <a name='name' />
-        <a name='required' format='boolean' />
-        <a name='version' format='integer' api-level='24' />
+        <a name='name' api-level='35' />
     </e>
-    <e name='uses-sdk' api-level='10'>
+    <e name='queries' api-level='35'>
         <parent>manifest</parent>
-        <a name='minSdkVersion' format='integer|string' />
-        <a name='targetSdkVersion' format='integer|string' />
-        <a name='maxSdkVersion' format='integer' />
-        <a name='minSdkVersionFull' format='string' api-level='Baklava' />
     </e>
-    <e name='uses-library' api-level='10'>
+    <e name='queries-package' api-level='35'>
+        <parent>queries</parent>
+        <a name='name' api-level='35' />
+    </e>
+    <e name='queries-intent' api-level='35'>
+        <parent>queries</parent>
+    </e>
+    <e name='queries-provider' api-level='35'>
+        <parent>queries</parent>
+        <a name='authorities' api-level='35' />
+    </e>
+    <e name='sdk-library' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='versionMajor' format='integer' api-level='35' />
+    </e>
+    <e name='uses-sdk-library' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='versionMajor' format='integer' api-level='35' />
+        <a name='certDigest' format='string' api-level='35' />
+        <a name='optional' format='boolean' api-level='35' />
+    </e>
+    <e name='static-library' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='version' api-level='35' />
+        <a name='versionMajor' format='integer' api-level='35' />
+    </e>
+    <e name='uses-library' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='required' api-level='35' />
+    </e>
+    <e name='uses-native-library' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='required' api-level='35' />
+    </e>
+    <e name='uses-static-library' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='required' />
+        <a name='name' api-level='35' />
+        <a name='version' api-level='35' />
+        <a name='certDigest' format='string' api-level='35' />
     </e>
-    <e name='supports-screens' api-level='10'>
+    <e name='additional-certificate' api-level='35'>
+        <parent>uses-static-library</parent>
+        <a name='certDigest' api-level='35' />
+    </e>
+    <e name='uses-package' api-level='35'>
+        <parent>application</parent>
+        <a name='packageType' format='string' api-level='35' />
+        <a name='name' api-level='35' />
+        <a name='version' api-level='35' />
+        <a name='versionMajor' format='integer' api-level='35' />
+        <a name='certDigest' format='string' api-level='35' />
+    </e>
+    <e name='supports-screens' api-level='35'>
         <parent>manifest</parent>
-        <a name='smallScreens' format='boolean' />
-        <a name='normalScreens' format='boolean' />
-        <a name='largeScreens' format='boolean' />
-        <a name='xlargeScreens' format='boolean' />
-        <a name='resizeable' format='boolean' />
-        <a name='anyDensity' format='boolean' />
-        <a name='requiresSmallestWidthDp' format='integer' api-level='15' />
-        <a name='compatibleWidthLimitDp' format='integer' api-level='15' />
-        <a name='largestWidthLimitDp' format='integer' api-level='15' />
-    </e>
-    <e name='protected-broadcast' api-level='10'>
+        <a name='requiresSmallestWidthDp' format='integer' api-level='35' />
+        <a name='compatibleWidthLimitDp' format='integer' api-level='35' />
+        <a name='largestWidthLimitDp' format='integer' api-level='35' />
+        <a name='smallScreens' format='boolean' api-level='35' />
+        <a name='normalScreens' format='boolean' api-level='35' />
+        <a name='largeScreens' format='boolean' api-level='35' />
+        <a name='xlargeScreens' format='boolean' api-level='35' />
+        <a name='resizeable' format='boolean' api-level='35' />
+        <a name='anyDensity' format='boolean' api-level='35' />
+    </e>
+    <e name='protected-broadcast' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
+        <a name='name' api-level='35' />
     </e>
-    <e name='original-package' api-level='10'>
+    <e name='original-package' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
+        <a name='name' api-level='35' />
+    </e>
+    <e name='processes' api-level='35'>
+        <parent>application</parent>
+    </e>
+    <e name='process' api-level='35'>
+        <parent>processes</parent>
+        <a name='process' api-level='35' />
+        <a name='name' api-level='35' />
+        <a name='gwpAsanMode' api-level='35' />
+        <a name='memtagMode' api-level='35' />
+        <a name='nativeHeapZeroInitialized' api-level='35' />
+        <a name='useEmbeddedDex' api-level='35' />
+        <a name='singleUser' api-level='37.1' />
     </e>
-    <e name='provider' api-level='10'>
+    <e name='deny-permission' api-level='35'>
+        <parent>processes</parent>
+        <a name='name' api-level='35' />
+    </e>
+    <e name='allow-permission' api-level='35'>
+        <parent>processes</parent>
+        <a name='name' api-level='35' />
+    </e>
+    <e name='provider' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='description' />
-        <a name='icon' />
-        <a name='process' />
-        <a name='authorities' />
-        <a name='syncable' />
-        <a name='readPermission' />
-        <a name='writePermission' />
-        <a name='grantUriPermissions' />
-        <a name='permission' />
-        <a name='multiprocess' />
-        <a name='initOrder' />
-        <a name='enabled' />
-        <a name='exported' />
-        <a name='logo' api-level='15' />
-        <a name='singleUser' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='directBootAware' api-level='24' />
-        <a name='roundIcon' api-level='25' />
-        <a name='visibleToInstantApps' api-level='26' />
-        <a name='splitName' api-level='26' />
-        <a name='forceUriPermissions' api-level='29' />
-        <a name='attributionTags' api-level='31' />
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='process' api-level='35' />
+        <a name='authorities' api-level='35' />
+        <a name='syncable' api-level='35' />
+        <a name='readPermission' api-level='35' />
+        <a name='writePermission' api-level='35' />
+        <a name='grantUriPermissions' api-level='35' />
+        <a name='forceUriPermissions' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='multiprocess' api-level='35' />
+        <a name='initOrder' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='exported' api-level='35' />
+        <a name='singleUser' api-level='35' />
+        <a name='directBootAware' api-level='35' />
+        <a name='visibleToInstantApps' api-level='35' />
+        <a name='splitName' api-level='35' />
+        <a name='attributionTags' api-level='35' />
         <a name='systemUserOnly' format='boolean' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
+        <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='grant-uri-permission' api-level='10'>
+    <e name='grant-uri-permission' api-level='35'>
         <parent>provider</parent>
-        <a name='path' format='string' />
-        <a name='pathPrefix' format='string' />
-        <a name='pathPattern' format='string' />
-        <a name='pathAdvancedPattern' format='string' api-level='31' />
-        <a name='pathSuffix' format='string' api-level='31' />
+        <a name='path' format='string' api-level='35' />
+        <a name='pathPrefix' format='string' api-level='35' />
+        <a name='pathPattern' format='string' api-level='35' />
+        <a name='pathAdvancedPattern' format='string' api-level='35' />
+        <a name='pathSuffix' format='string' api-level='35' />
     </e>
-    <e name='path-permission' api-level='10'>
+    <e name='path-permission' api-level='35'>
         <parent>provider</parent>
-        <a name='path' />
-        <a name='pathPrefix' />
-        <a name='pathPattern' />
-        <a name='permission' />
-        <a name='readPermission' />
-        <a name='writePermission' />
-        <a name='pathAdvancedPattern' api-level='26' />
-        <a name='pathSuffix' api-level='31' />
-    </e>
-    <e name='service' api-level='10'>
+        <a name='path' api-level='35' />
+        <a name='pathPrefix' api-level='35' />
+        <a name='pathPattern' api-level='35' />
+        <a name='pathAdvancedPattern' format='string' api-level='35' />
+        <a name='pathSuffix' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='readPermission' api-level='35' />
+        <a name='writePermission' api-level='35' />
+    </e>
+    <e name='service' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='description' />
-        <a name='icon' />
-        <a name='permission' />
-        <a name='process' />
-        <a name='enabled' />
-        <a name='exported' />
-        <a name='logo' api-level='15' />
-        <a name='stopWithTask' format='boolean' api-level='15' />
-        <a name='isolatedProcess' format='boolean' api-level='16' />
-        <a name='singleUser' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='directBootAware' api-level='24' />
-        <a name='externalService' format='boolean' api-level='24' />
-        <a name='roundIcon' api-level='25' />
-        <a name='visibleToInstantApps' api-level='26' />
-        <a name='splitName' api-level='26' />
-        <a name='useAppZygote' format='boolean' api-level='29' />
-        <a name='foregroundServiceType' api-level='29' />
-        <a name='attributionTags' api-level='31' />
-        <a name='allowSharedIsolatedProcess' format='boolean' api-level='34' />
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='process' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='exported' api-level='35' />
+        <a name='stopWithTask' format='boolean' api-level='35' />
+        <a name='isolatedProcess' format='boolean' api-level='35' />
+        <a name='singleUser' api-level='35' />
+        <a name='directBootAware' api-level='35' />
+        <a name='externalService' format='boolean' api-level='35' />
+        <a name='visibleToInstantApps' api-level='35' />
+        <a name='splitName' api-level='35' />
+        <a name='useAppZygote' format='boolean' api-level='35' />
+        <a name='foregroundServiceType' api-level='35' />
+        <a name='attributionTags' api-level='35' />
+        <a name='allowSharedIsolatedProcess' format='boolean' api-level='35' />
         <a name='systemUserOnly' format='boolean' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
+        <a name='privateComputeCore' api-level='37.0' />
+        <a name='nativeService' format='boolean' api-level='37.0' />
     </e>
-    <e name='receiver' api-level='10'>
+    <e name='apex-system-service' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='label' />
-        <a name='description' />
-        <a name='icon' />
-        <a name='permission' />
-        <a name='process' />
-        <a name='enabled' />
-        <a name='exported' />
-        <a name='logo' api-level='15' />
-        <a name='singleUser' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='directBootAware' api-level='24' />
-        <a name='roundIcon' api-level='25' />
-        <a name='attributionTags' api-level='31' />
+        <a name='name' api-level='35' />
+        <a name='path' api-level='35' />
+        <a name='minSdkVersion' api-level='35' />
+        <a name='maxSdkVersion' api-level='35' />
+        <a name='initOrder' format='integer' api-level='35' />
+    </e>
+    <e name='receiver' api-level='35'>
+        <parent>application</parent>
+        <a name='name' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='process' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='exported' api-level='35' />
+        <a name='singleUser' api-level='35' />
+        <a name='directBootAware' api-level='35' />
+        <a name='attributionTags' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
+        <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='activity' api-level='10'>
+    <e name='activity' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='theme' />
-        <a name='label' />
-        <a name='description' />
-        <a name='icon' />
-        <a name='launchMode' />
-        <a name='screenOrientation' />
-        <a name='configChanges' />
-        <a name='permission' />
-        <a name='multiprocess' />
-        <a name='process' />
-        <a name='taskAffinity' />
-        <a name='allowTaskReparenting' />
-        <a name='finishOnTaskLaunch' />
-        <a name='finishOnCloseSystemDialogs' />
-        <a name='clearTaskOnLaunch' />
-        <a name='noHistory' />
-        <a name='alwaysRetainTaskState' />
-        <a name='stateNotNeeded' />
-        <a name='excludeFromRecents' />
-        <a name='enabled' />
-        <a name='exported' />
-        <a name='windowSoftInputMode' />
-        <a name='logo' api-level='15' />
-        <a name='immersive' api-level='15' />
-        <a name='hardwareAccelerated' api-level='15' />
-        <a name='uiOptions' api-level='15' />
-        <a name='parentActivityName' api-level='16' />
-        <a name='showOnLockScreen' api-level='17' />
-        <a name='singleUser' api-level='17' />
-        <a name='primaryUserOnly' format='boolean' api-level='17' />
-        <a name='banner' api-level='20' />
-        <a name='allowEmbedded' api-level='20' />
-        <a name='persistableMode' api-level='21' />
-        <a name='documentLaunchMode' api-level='21' />
-        <a name='maxRecents' api-level='21' />
-        <a name='autoRemoveFromRecents' api-level='21' />
-        <a name='relinquishTaskIdentity' api-level='21' />
-        <a name='resumeWhilePausing' api-level='21' />
-        <a name='resizeableActivity' api-level='23' />
-        <a name='lockTaskMode' api-level='23' />
-        <a name='showForAllUsers' api-level='23' />
-        <a name='systemUserOnly' format='boolean' api-level='24' />
-        <a name='supportsPictureInPicture' api-level='24' />
-        <a name='directBootAware' api-level='24' />
-        <a name='alwaysFocusable' format='boolean' api-level='24' />
-        <a name='enableVrMode' api-level='24' />
-        <a name='roundIcon' api-level='25' />
-        <a name='recreateOnConfigChanges' api-level='26' />
-        <a name='maxAspectRatio' api-level='26' />
-        <a name='rotationAnimation' api-level='26' />
-        <a name='visibleToInstantApps' api-level='26' />
-        <a name='splitName' api-level='26' />
-        <a name='colorMode' api-level='26' />
-        <a name='showWhenLocked' api-level='27' />
-        <a name='turnScreenOn' api-level='27' />
-        <a name='minAspectRatio' api-level='29' />
-        <a name='inheritShowWhenLocked' api-level='29' />
-        <a name='forceQueryable' format='boolean' api-level='30' />
-        <a name='preferMinimalPostProcessing' format='boolean' api-level='30' />
-        <a name='attributionTags' api-level='31' />
-        <a name='playHomeTransitionSound' format='boolean' api-level='31' />
-        <a name='canDisplayOnRemoteDevices' format='boolean' api-level='33' />
-        <a name='allowUntrustedActivityEmbedding' api-level='33' />
-        <a name='knownActivityEmbeddingCerts' api-level='33' />
-        <a name='requiredDisplayCategory' format='string' api-level='34' />
-        <a name='enableOnBackInvokedCallback' format='boolean' api-level='34' />
+        <a name='name' api-level='35' />
+        <a name='theme' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='launchMode' api-level='35' />
+        <a name='screenOrientation' api-level='35' />
+        <a name='configChanges' api-level='35' />
+        <a name='recreateOnConfigChanges' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='multiprocess' api-level='35' />
+        <a name='process' api-level='35' />
+        <a name='taskAffinity' api-level='35' />
+        <a name='allowTaskReparenting' api-level='35' />
+        <a name='finishOnTaskLaunch' api-level='35' />
+        <a name='finishOnCloseSystemDialogs' api-level='35' />
+        <a name='clearTaskOnLaunch' api-level='35' />
+        <a name='noHistory' api-level='35' />
+        <a name='alwaysRetainTaskState' api-level='35' />
+        <a name='stateNotNeeded' api-level='35' />
+        <a name='excludeFromRecents' api-level='35' />
+        <a name='showOnLockScreen' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='exported' api-level='35' />
+        <a name='windowSoftInputMode' api-level='35' />
+        <a name='immersive' api-level='35' />
+        <a name='hardwareAccelerated' api-level='35' />
+        <a name='uiOptions' api-level='35' />
+        <a name='parentActivityName' api-level='35' />
+        <a name='singleUser' api-level='35' />
+        <a name='systemUserOnly' format='boolean' api-level='35' />
+        <a name='persistableMode' api-level='35' />
+        <a name='allowEmbedded' api-level='35' />
+        <a name='documentLaunchMode' api-level='35' />
+        <a name='maxRecents' api-level='35' />
+        <a name='autoRemoveFromRecents' api-level='35' />
+        <a name='relinquishTaskIdentity' api-level='35' />
+        <a name='resumeWhilePausing' api-level='35' />
+        <a name='resizeableActivity' api-level='35' />
+        <a name='supportsPictureInPicture' api-level='35' />
+        <a name='maxAspectRatio' api-level='35' />
+        <a name='minAspectRatio' api-level='35' />
+        <a name='lockTaskMode' api-level='35' />
+        <a name='showForAllUsers' api-level='35' />
+        <a name='showWhenLocked' api-level='35' />
+        <a name='inheritShowWhenLocked' api-level='35' />
+        <a name='turnScreenOn' api-level='35' />
+        <a name='directBootAware' api-level='35' />
+        <a name='alwaysFocusable' format='boolean' api-level='35' />
+        <a name='enableVrMode' api-level='35' />
+        <a name='rotationAnimation' api-level='35' />
+        <a name='visibleToInstantApps' api-level='35' />
+        <a name='splitName' api-level='35' />
+        <a name='colorMode' api-level='35' />
+        <a name='forceQueryable' format='boolean' api-level='35' />
+        <a name='preferMinimalPostProcessing' format='boolean' api-level='35' />
+        <a name='attributionTags' api-level='35' />
+        <a name='playHomeTransitionSound' format='boolean' api-level='35' />
+        <a name='canDisplayOnRemoteDevices' format='boolean' api-level='35' />
+        <a name='allowUntrustedActivityEmbedding' api-level='35' />
+        <a name='knownActivityEmbeddingCerts' api-level='35' />
+        <a name='requiredDisplayCategory' format='string' api-level='35' />
+        <a name='enableOnBackInvokedCallback' format='boolean' api-level='35' />
         <a name='requireContentUriPermissionFromCaller' format='string' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
+        <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='activity-alias' api-level='10'>
+    <e name='activity-alias' api-level='35'>
         <parent>application</parent>
-        <a name='name' />
-        <a name='targetActivity' format='string' />
-        <a name='label' />
-        <a name='description' />
-        <a name='icon' />
-        <a name='permission' />
-        <a name='enabled' />
-        <a name='exported' />
-        <a name='logo' api-level='15' />
-        <a name='parentActivityName' api-level='16' />
-        <a name='banner' api-level='20' />
-        <a name='roundIcon' api-level='25' />
-        <a name='attributionTags' api-level='31' />
-        <a name='allowUntrustedActivityEmbedding' api-level='33' />
-        <a name='knownActivityEmbeddingCerts' api-level='33' />
+        <a name='name' api-level='35' />
+        <a name='targetActivity' format='string' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='description' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='permission' api-level='35' />
+        <a name='enabled' api-level='35' />
+        <a name='exported' api-level='35' />
+        <a name='parentActivityName' api-level='35' />
+        <a name='attributionTags' api-level='35' />
+        <a name='allowUntrustedActivityEmbedding' api-level='35' />
+        <a name='knownActivityEmbeddingCerts' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
+        <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='meta-data' api-level='10'>
+    <e name='meta-data' api-level='35'>
         <parent>application</parent>
         <parent>activity</parent>
         <parent>receiver</parent>
@@ -394,44 +513,59 @@
         <parent>permission</parent>
         <parent>permission-group</parent>
         <parent>instrumentation</parent>
-        <a name='name' />
-        <a name='value' format='string|integer|color|float|boolean' />
-        <a name='resource' format='reference' />
+        <a name='name' api-level='35' />
+        <a name='value' format='string|integer|color|float|boolean' api-level='35' />
+        <a name='resource' format='reference' api-level='35' />
     </e>
-    <e name='intent-filter' api-level='10'>
+    <e name='property' api-level='35'>
+        <parent>application</parent>
+        <parent>activity</parent>
+        <parent>receiver</parent>
+        <parent>provider</parent>
+        <parent>service</parent>
+        <a name='name' api-level='35' />
+        <a name='value' api-level='35' />
+        <a name='resource' api-level='35' />
+    </e>
+    <e name='intent-filter' api-level='35'>
         <parent>activity</parent>
         <parent>receiver</parent>
         <parent>service</parent>
-        <a name='label' />
-        <a name='icon' />
-        <a name='priority' />
-        <a name='logo' api-level='15' />
-        <a name='banner' api-level='20' />
-        <a name='autoVerify' api-level='23' />
-        <a name='roundIcon' api-level='25' />
-        <a name='order' api-level='28' />
-    </e>
-    <e name='action' api-level='10'>
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='priority' api-level='35' />
+        <a name='autoVerify' api-level='35' />
+        <a name='order' api-level='35' />
+    </e>
+    <e name='action' api-level='35'>
         <parent>intent-filter</parent>
-        <a name='name' />
+        <a name='name' api-level='35' />
     </e>
-    <e name='data' api-level='10'>
+    <e name='uri-relative-filter-group' api-level='35'>
         <parent>intent-filter</parent>
-        <a name='mimeType' format='string' />
-        <a name='scheme' format='string' />
-        <a name='host' format='string' />
-        <a name='port' format='string' />
-        <a name='path' />
-        <a name='pathPrefix' />
-        <a name='pathPattern' />
-        <a name='ssp' format='string' api-level='19' />
-        <a name='sspPrefix' format='string' api-level='19' />
-        <a name='sspPattern' format='string' api-level='19' />
-        <a name='pathAdvancedPattern' api-level='26' />
-        <a name='mimeGroup' format='string' api-level='30' />
-        <a name='sspAdvancedPattern' format='string' api-level='31' />
-        <a name='sspSuffix' format='string' api-level='31' />
-        <a name='pathSuffix' api-level='31' />
+        <a name='allow' format='boolean' api-level='35' />
+    </e>
+    <e name='data' api-level='35'>
+        <parent>intent-filter</parent>
+        <parent>uri-relative-filter-group</parent>
+        <a name='mimeType' format='string' api-level='35' />
+        <a name='mimeGroup' format='string' api-level='35' />
+        <a name='scheme' format='string' api-level='35' />
+        <a name='ssp' format='string' api-level='35' />
+        <a name='sspPrefix' format='string' api-level='35' />
+        <a name='sspPattern' format='string' api-level='35' />
+        <a name='sspAdvancedPattern' format='string' api-level='35' />
+        <a name='sspSuffix' format='string' api-level='35' />
+        <a name='host' format='string' api-level='35' />
+        <a name='port' format='string' api-level='35' />
+        <a name='path' api-level='35' />
+        <a name='pathPrefix' api-level='35' />
+        <a name='pathPattern' api-level='35' />
+        <a name='pathAdvancedPattern' api-level='35' />
+        <a name='pathSuffix' api-level='35' />
         <a name='query' format='string' api-level='35' />
         <a name='queryPrefix' format='string' api-level='35' />
         <a name='queryPattern' format='string' api-level='35' />
@@ -443,230 +577,104 @@
         <a name='fragmentAdvancedPattern' format='string' api-level='35' />
         <a name='fragmentSuffix' format='string' api-level='35' />
     </e>
-    <e name='category' api-level='10'>
+    <e name='category' api-level='35'>
         <parent>intent-filter</parent>
-        <a name='name' />
+        <a name='name' api-level='35' />
     </e>
-    <e name='instrumentation' api-level='10'>
+    <e name='instrumentation' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' />
-        <a name='targetPackage' />
-        <a name='label' />
-        <a name='icon' />
-        <a name='handleProfiling' />
-        <a name='functionalTest' />
-        <a name='logo' api-level='15' />
-        <a name='banner' api-level='20' />
-        <a name='roundIcon' api-level='25' />
-        <a name='targetProcesses' api-level='26' />
-    </e>
-    <e name='compatible-screens-screen' api-level='10'>
+        <a name='name' api-level='35' />
+        <a name='targetPackage' api-level='35' />
+        <a name='targetProcesses' api-level='35' />
+        <a name='label' api-level='35' />
+        <a name='icon' api-level='35' />
+        <a name='roundIcon' api-level='35' />
+        <a name='banner' api-level='35' />
+        <a name='logo' api-level='35' />
+        <a name='handleProfiling' api-level='35' />
+        <a name='functionalTest' api-level='35' />
+    </e>
+    <e name='compatible-screens-screen' api-level='35'>
         <parent>compatible-screens</parent>
-        <a name='screenSize' />
-        <a name='screenDensity' format='integer' />
-    </e>
-    <e name='intent' api-level='10'>
-        <a name='action' format='string' />
-        <a name='data' format='string' />
-        <a name='mimeType' />
-        <a name='targetPackage' />
-        <a name='targetClass' format='string' />
-        <a name='identifier' format='string' api-level='29' />
-    </e>
-    <e name='intent-category' api-level='10'>
-        <parent>intent</parent>
-        <a name='name' />
+        <a name='screenSize' api-level='35' />
+        <a name='screenDensity' format='integer' api-level='35' />
     </e>
-    <e name='extra' api-level='10'>
-        <parent>intent</parent>
-        <a name='name' />
-        <a name='value' />
+    <e name='supports-input-input-type' api-level='35'>
+        <parent>supports-input</parent>
+        <a name='name' api-level='35' />
     </e>
-    <e name='package-verifier' api-level='15'>
+    <e name='package-verifier' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' api-level='15' />
-        <a name='publicKey' api-level='15' />
+        <a name='name' api-level='35' />
+        <a name='publicKey' api-level='35' />
     </e>
-    <e name='library' api-level='18'>
+    <e name='resource-overlay' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' api-level='18' />
-    </e>
-    <e name='supports-input-input-type' api-level='19'>
-        <parent>supports-input</parent>
-        <a name='name' api-level='19' />
+        <a name='targetPackage' api-level='35' />
+        <a name='category' format='string' api-level='35' />
+        <a name='priority' api-level='35' />
+        <a name='isStatic' format='boolean' api-level='35' />
+        <a name='requiredSystemPropertyName' format='string' api-level='35' />
+        <a name='requiredSystemPropertyValue' format='string' api-level='35' />
+        <a name='targetName' api-level='35' />
+        <a name='resourcesMap' format='reference' api-level='35' />
+    </e>
+    <e name='intent' api-level='35'>
+        <a name='action' format='string' api-level='35' />
+        <a name='data' format='string' api-level='35' />
+        <a name='mimeType' api-level='35' />
+        <a name='identifier' format='string' api-level='35' />
+        <a name='targetPackage' api-level='35' />
+        <a name='targetClass' format='string' api-level='35' />
+    </e>
+    <e name='intent-category' api-level='35'>
+        <parent>intent</parent>
+        <a name='name' api-level='35' />
     </e>
-    <e name='public-key' api-level='19'>
-        <a name='value' api-level='19' />
-        <a name='name' api-level='21' />
+    <e name='extra' api-level='35'>
+        <parent>intent</parent>
+        <a name='name' api-level='35' />
+        <a name='value' api-level='35' />
     </e>
-    <e name='key-set' api-level='19'>
-        <a name='name' api-level='19' />
+    <e name='public-key' api-level='35'>
+        <a name='name' api-level='35' />
+        <a name='value' api-level='35' />
     </e>
-    <e name='feature-group' api-level='21'>
-        <a name='label' api-level='21' />
+    <e name='key-set' api-level='35'>
+        <a name='name' api-level='35' />
     </e>
-    <e name='resource-overlay' api-level='21'>
-        <parent>manifest</parent>
-        <a name='targetPackage' api-level='21' />
-        <a name='priority' api-level='21' />
-        <a name='isStatic' format='boolean' api-level='26' />
-        <a name='requiredSystemPropertyName' format='string' api-level='26' />
-        <a name='requiredSystemPropertyValue' format='string' api-level='26' />
-        <a name='category' format='string' api-level='28' />
-        <a name='targetName' api-level='29' />
-        <a name='resourcesMap' format='reference' api-level='30' />
-    </e>
-    <e name='upgrade-key-set' api-level='21'>
+    <e name='upgrade-key-set' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' api-level='21' />
+        <a name='name' api-level='35' />
     </e>
-    <e name='layout' api-level='24'>
+    <e name='layout' api-level='35'>
         <parent>activity</parent>
-        <a name='defaultWidth' format='dimension|fraction' api-level='24' />
-        <a name='defaultHeight' format='dimension|fraction' api-level='24' />
-        <a name='gravity' api-level='24' />
-        <a name='minWidth' api-level='24' />
-        <a name='minimalWidth' format='dimension' api-level='24' />
-        <a name='minHeight' api-level='24' />
-        <a name='minimalHeight' format='dimension' api-level='24' />
-        <a name='windowLayoutAffinity' format='string' api-level='31' />
-    </e>
-    <e name='restrict-update' api-level='24'>
-        <parent>manifest</parent>
-        <a name='hash' format='string' api-level='24' />
-    </e>
-    <e name='static-library' api-level='26'>
-        <parent>application</parent>
-        <a name='name' api-level='26' />
-        <a name='version' api-level='26' />
-        <a name='versionMajor' format='integer' api-level='28' />
-    </e>
-    <e name='uses-static-library' api-level='26'>
-        <parent>application</parent>
-        <a name='name' api-level='26' />
-        <a name='version' api-level='26' />
-        <a name='certDigest' format='string' api-level='26' />
-    </e>
-    <e name='uses-split' api-level='26'>
+        <a name='defaultWidth' format='dimension|fraction' api-level='35' />
+        <a name='defaultHeight' format='dimension|fraction' api-level='35' />
+        <a name='gravity' api-level='35' />
+        <a name='minWidth' api-level='35' />
+        <a name='minHeight' api-level='35' />
+        <a name='windowLayoutAffinity' format='string' api-level='35' />
+    </e>
+    <e name='restrict-update' api-level='35'>
         <parent>manifest</parent>
-        <a name='name' format='string' api-level='26' />
+        <a name='hash' format='string' api-level='35' />
     </e>
-    <e name='additional-certificate' api-level='27'>
-        <parent>uses-static-library</parent>
-        <a name='certDigest' api-level='27' />
-    </e>
-    <e name='uses-package' api-level='29'>
-        <parent>application</parent>
-        <a name='packageType' format='string' api-level='29' />
-        <a name='name' api-level='29' />
-        <a name='version' api-level='29' />
-        <a name='versionMajor' format='integer' api-level='29' />
-        <a name='certDigest' format='string' api-level='29' />
-    </e>
-    <e name='profileable' api-level='29'>
-        <parent>application</parent>
-        <a name='shell' format='boolean' api-level='29' />
-        <a name='enabled' format='boolean' api-level='31' />
-    </e>
-    <e name='attribution' api-level='30'>
+    <e name='uses-split' api-level='35'>
         <parent>manifest</parent>
-        <a name='featureId' format='string' api-level='30' />
-        <a name='tag' format='string' api-level='30' />
-        <a name='label' format='string' api-level='30' />
-    </e>
-    <e name='attribution-inherit-from' api-level='30'>
-        <parent>attribution</parent>
-        <a name='tag' format='string' api-level='30' />
-    </e>
-    <e name='extension-sdk' api-level='30'>
-        <a name='sdkVersion' format='integer' api-level='30' />
-        <a name='minExtensionVersion' format='integer' api-level='30' />
-    </e>
-    <e name='queries' api-level='30'>
-        <parent>manifest</parent>
-    </e>
-    <e name='queries-package' api-level='30'>
-        <parent>queries</parent>
-        <a name='name' api-level='30' />
-    </e>
-    <e name='queries-intent' api-level='30'>
-        <parent>queries</parent>
-    </e>
-    <e name='queries-provider' api-level='30'>
-        <parent>queries</parent>
-        <a name='authorities' api-level='30' />
-    </e>
-    <e name='processes' api-level='30'>
-        <parent>application</parent>
-    </e>
-    <e name='process' api-level='30'>
-        <parent>processes</parent>
-        <a name='process' api-level='30' />
-        <a name='gwpAsanMode' api-level='30' />
-        <a name='memtagMode' api-level='31' />
-        <a name='nativeHeapZeroInitialized' api-level='31' />
-        <a name='name' api-level='33' />
-        <a name='useEmbeddedDex' api-level='35' />
-    </e>
-    <e name='deny-permission' api-level='30'>
-        <parent>processes</parent>
-        <a name='name' api-level='30' />
-    </e>
-    <e name='allow-permission' api-level='30'>
-        <parent>processes</parent>
-        <a name='name' api-level='30' />
-    </e>
-    <e name='required-feature' api-level='31'>
-        <a name='name' api-level='31' />
-    </e>
-    <e name='required-not-feature' api-level='31'>
-        <a name='name' api-level='31' />
-    </e>
-    <e name='uses-native-library' api-level='31'>
-        <parent>application</parent>
-        <a name='name' api-level='31' />
-        <a name='required' api-level='31' />
-    </e>
-    <e name='property' api-level='31'>
-        <parent>application</parent>
-        <parent>activity</parent>
-        <parent>receiver</parent>
-        <parent>provider</parent>
-        <parent>service</parent>
-        <a name='name' api-level='31' />
-        <a name='value' api-level='31' />
-        <a name='resource' api-level='31' />
-    </e>
-    <e name='sdk-library' api-level='33'>
-        <parent>application</parent>
-        <a name='name' api-level='33' />
-        <a name='versionMajor' format='integer' api-level='33' />
+        <a name='name' format='string' api-level='35' />
     </e>
-    <e name='uses-sdk-library' api-level='33'>
+    <e name='profileable' api-level='35'>
         <parent>application</parent>
-        <a name='name' api-level='33' />
-        <a name='versionMajor' format='integer' api-level='33' />
-        <a name='certDigest' format='string' api-level='33' />
-        <a name='optional' format='boolean' api-level='35' />
+        <a name='shell' format='boolean' api-level='35' />
+        <a name='enabled' format='boolean' api-level='35' />
     </e>
-    <e name='apex-system-service' api-level='33'>
-        <parent>application</parent>
-        <a name='name' api-level='33' />
-        <a name='path' api-level='33' />
-        <a name='minSdkVersion' api-level='33' />
-        <a name='maxSdkVersion' api-level='33' />
-        <a name='initOrder' format='integer' api-level='33' />
-    </e>
-    <e name='install-constraints' api-level='34'>
+    <e name='install-constraints' api-level='35'>
         <parent>manifest</parent>
     </e>
-    <e name='install-constraints-fingerprint-prefix' api-level='34'>
+    <e name='install-constraints-fingerprint-prefix' api-level='35'>
         <parent>install-constraints</parent>
-        <a name='value' api-level='34' />
-    </e>
-    <e name='uri-relative-filter-group' api-level='35'>
-        <parent>intent-filter</parent>
-        <a name='allow' format='boolean' api-level='35' />
+        <a name='value' api-level='35' />
     </e>
     <e name='valid-purpose' api-level='36.1'>
         <parent>permission</parent>
@@ -683,4 +691,31 @@
         <parent>manifest</parent>
         <a name='name' api-level='36.1' />
     </e>
+    <e name='valid-general-purpose' api-level='37.0'>
+        <parent>permission</parent>
+        <a name='name' format='string' api-level='37.0' />
+        <a name='maxTargetSdkVersion' format='integer' api-level='37.0' />
+    </e>
+    <e name='general-purpose' api-level='37.0'>
+        <parent>uses-permission</parent>
+        <a name='name' format='string' api-level='37.0' />
+        <a name='minSdkVersion' format='integer|string' api-level='37.0' />
+        <a name='maxSdkVersion' format='integer' api-level='37.0' />
+    </e>
+    <e name='allow-component-access' api-level='37.0'>
+        <parent>manifest</parent>
+    </e>
+    <e name='allow-component-access-package' api-level='37.0'>
+        <parent>allow-component-access</parent>
+        <a name='name' api-level='37.0' />
+        <a name='certDigest' format='string' api-level='37.0' />
+    </e>
+    <e name='memory-budget' api-level='37.1'>
+        <parent>application</parent>
+        <a name='maxMb' api-level='37.1' />
+        <a name='state' api-level='37.1' />
+        <a name='additionalBytesPerDisplayPixel' api-level='37.1' />
+        <a name='additionalMbPerDensity' api-level='37.1' />
+        <a name='feature' api-level='37.1' />
+    </e>
 </m>
diff --git a/build-tools/manifest-attribute-codegen/metadata.xml b/build-tools/manifest-attribute-codegen/metadata.xml
index 7adf65ae0e6..ba9ed3d3a8d 100644
--- a/build-tools/manifest-attribute-codegen/metadata.xml
+++ b/build-tools/manifest-attribute-codegen/metadata.xml
@@ -25,6 +25,8 @@
   <!-- Manifest elements to ignore -->
   <type name="action" ignore="true" />
   <type name="activity-alias" ignore="true" />
+  <type name="allow-component-access" ignore="true" />
+  <type name="allow-component-access-package" ignore="true" />
   <type name="additional-certificate" ignore="true" />
   <type name="adopt-permissions" ignore="true" />
   <type name="allow-permission" ignore="true" />
@@ -38,6 +40,7 @@
   <type name="extension-sdk" ignore="true" />
   <type name="extra" ignore="true" />
   <type name="feature-group" ignore="true" />
+  <type name="general-purpose" ignore="true" />
   <type name="install-constraints" ignore="true" />
   <type name="install-constraints-fingerprint-prefix" ignore="true" />
   <type name="intent" ignore="true" />
@@ -45,6 +48,7 @@
   <type name="key-set" ignore="true" />
   <type name="library" ignore="true" />
   <type name="manifest" ignore="true" />
+  <type name="memory-budget" ignore="true" />
   <type name="original-package" ignore="true" />
   <type name="package-verifier" ignore="true" />
   <type name="path-permission" ignore="true" />
@@ -74,6 +78,7 @@
   <type name="uses-sdk-library" ignore="true" />
   <type name="uses-split" ignore="true" />
   <type name="uses-static-library" ignore="true" />
+  <type name="valid-general-purpose" ignore="true" />
   <type name="valid-purpose" ignore="true" />
 
   <!-- <activity> - https://developer.android.com/guide/topics/manifest/activity-element -->
@@ -144,7 +149,7 @@
   <element path="activity.minAspectRatio" visible="false" />
   <element path="activity.playHomeTransitionSound" visible="false" />
   <element path="activity.preferMinimalPostProcessing" visible="false" />
-  <element path="activity.primaryUserOnly" visible="false" />
+  <element path="activity.privateComputeCore" visible="false" />
   <element path="activity.requiredDisplayCategory" visible="false" />
   <element path="activity.splitName" visible="false" />
   <element path="activity.systemUserOnly" visible="false" />
@@ -206,6 +211,7 @@
   <element path="application.appComponentFactory" visible="false" />
   <element path="application.attributionsAreUserVisible" visible="false" />
   <element path="application.autoRevokePermissions" visible="false" />
+  <element path="application.backupAgentProcess" visible="false" />
   <element path="application.cantSaveState" visible="false" />
   <element path="application.classLoader" visible="false" />
   <element path="application.crossProfile" visible="false" />
@@ -220,7 +226,6 @@
   <element path="application.minAspectRatio" visible="false" />
   <element path="application.multiArch" visible="false" />
   <element path="application.nativeHeapZeroInitialized" visible="false" />
-  <element path="application.neverEncrypt" visible="false" />
   <element path="application.persistentWhenFeatureAvailable" visible="false" />
   <element path="application.preserveLegacyExternalStorage" visible="false" />
   <element path="application.requestForegroundServiceExemption" visible="false" />
@@ -232,6 +237,8 @@
   <element path="application.useEmbeddedDex" visible="false" />
   <element path="application.usesNonSdkApi" visible="false" />
   <element path="application.zygotePreloadName" visible="false" />
+  <element path="application.zygotePreloadNativeLib" visible="false" />
+  <element path="application.zygotePreloadNativeFunc" visible="false" />
   
   <!-- Documented as deprecated -->
   <element path="application.isGame" visible="false" />
@@ -280,8 +287,6 @@
   <element path="layout.minWidth" visible="true" />
 
   <!-- Undocumented attributes -->
-  <element path="layout.minimalHeight" visible="false" />
-  <element path="layout.minimalWidth" visible="false" />
   <element path="layout.windowLayoutAffinity" visible="false" />
 
   <!-- <meta-data> - https://developer.android.com/guide/topics/manifest/meta-data-element -->
@@ -306,7 +311,9 @@
   <element path="permission.maxSdkVersion" visible="false" />
   <element path="permission.permissionFlags" visible="false" />
   <element path="permission.request" visible="false" />
+  <element path="permission.requiresGeneralPurposeTargetSdkVersion" visible="false" />
   <element path="permission.requiresPurpose" visible="false" />
+  <element path="permission.requiresPurposeStringTargetSdkVersion" visible="false" />
   <element path="permission.requiresPurposeTargetSdkVersion" visible="false" />
 
   <!-- <permission-group> - https://developer.android.com/guide/topics/manifest/permission-group-element -->
@@ -366,6 +373,7 @@
   <element path="provider.forceUriPermissions" visible="false" />
   <element path="provider.intentMatchingFlags" visible="false" />
   <element path="provider.logo" visible="false" />
+  <element path="provider.privateComputeCore" visible="false" />
   <element path="provider.singleUser" visible="false" />
   <element path="provider.splitName" visible="false" />
   <element path="provider.systemUserOnly" visible="false" />
@@ -388,6 +396,7 @@
   <element path="receiver.banner" visible="false" />
   <element path="receiver.intentMatchingFlags" visible="false" />
   <element path="receiver.logo" visible="false" />
+  <element path="receiver.privateComputeCore" visible="false" />
   <element path="receiver.singleUser" visible="false" />
 
   <!-- <service> - https://developer.android.com/guide/topics/manifest/service-element -->
@@ -411,6 +420,8 @@
   <element path="service.externalService" visible="false" />
   <element path="service.intentMatchingFlags" visible="false" />
   <element path="service.logo" visible="false" />
+  <element path="service.nativeService" visible="false" />
+  <element path="service.privateComputeCore" visible="false" />
   <element path="service.singleUser" visible="false" />
   <element path="service.splitName" visible="false" />
   <element path="service.stopWithTask" visible="false" />
@@ -443,6 +454,7 @@
   <element path="uses-permission.minSdkVersion" visible="false" />
   <element path="uses-permission.requiredFeature" visible="false" />
   <element path="uses-permission.requiredNotFeature" visible="false" />
+  <element path="uses-permission.purposeString" visible="false" />
   <!-- usesPermissionFlags - https://developer.android.com/develop/connectivity/bluetooth/bt-permissions#assert-never-for-location -->
   <element path="uses-permission.usesPermissionFlags" visible="true" />
 
diff --git a/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj b/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
index a73aaea64d9..b38d12eaac0 100644
--- a/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
+++ b/src/Mono.Android.Runtime/Mono.Android.Runtime.csproj
@@ -40,12 +40,12 @@
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
   <!-- Only build the .NET 6+ version of 'Mono.Android.Runtime.dll' for the latest stable Android version. -->
-  <PropertyGroup Condition=" '$(AndroidApiLevel)' &lt; '$(AndroidDefaultTargetDotnetApiLevel)' ">
+  <PropertyGroup Condition="  $([MSBuild]::VersionLessThan($(AndroidApiLevel), $(AndroidDefaultTargetDotnetApiLevel)))  ">
     <BuildDependsOn></BuildDependsOn>
   </PropertyGroup>
   
   <!-- Copy .NET ref/runtime assemblies to bin/$(Configuration)/dotnet/packs folder -->
-  <PropertyGroup Condition=" '$(AndroidApiLevel)' &gt;= '$(AndroidDefaultTargetDotnetApiLevel)' ">
+  <PropertyGroup Condition=" $([MSBuild]::VersionGreaterThanOrEquals($(AndroidApiLevel), $(AndroidDefaultTargetDotnetApiLevel))) ">
     <BuildDependsOn>
       $(BuildDependsOn);
       _CopyToPackDirs;
@@ -58,7 +58,8 @@
     <PropertyGroup>
       <InformationalVersion>$(AndroidPackVersion).$(PackVersionCommitCount); git-rev-head:$(XAVersionHash); git-branch:$(XAVersionBranch)</InformationalVersion>
       <TargetPlatformIdentifier>Android</TargetPlatformIdentifier>
-      <TargetPlatformVersion>$(AndroidApiLevel).0</TargetPlatformVersion>
+      <TargetPlatformVersion Condition=" $(AndroidApiLevel.Contains('.')) ">$(AndroidApiLevel)</TargetPlatformVersion>
+      <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">$(AndroidApiLevel).0</TargetPlatformVersion>
       <SupportedOSPlatformVersion>$(AndroidMinimumDotNetApiLevel).0</SupportedOSPlatformVersion>
     </PropertyGroup>
   </Target>
diff --git a/src/Mono.Android/Mono.Android.Apis.projitems b/src/Mono.Android/Mono.Android.Apis.projitems
index 0691af8f6d9..930b5085039 100644
--- a/src/Mono.Android/Mono.Android.Apis.projitems
+++ b/src/Mono.Android/Mono.Android.Apis.projitems
@@ -245,7 +245,7 @@
       <Level>37</Level>
       <VersionCodeFull>37.1</VersionCodeFull>
       <Id>37.1</Id>
-      <Stable>False</Stable>
+      <Stable>True</Stable>
     </AndroidApiInfo>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Mono.Android/map.csv b/src/Mono.Android/map.csv
index ad20547d9b8..e1ab6af78d3 100644
--- a/src/Mono.Android/map.csv
+++ b/src/Mono.Android/map.csv
@@ -3208,6 +3208,99 @@ E,28,android/hardware/HardwareBuffer.S_UI8,53,Android.Hardware.HardwareBufferFor
 E,30,android/hardware/HardwareBuffer.YCBCR_420_888,35,Android.Hardware.HardwareBufferFormat,Ycbcr420888,remove,
 E,33,android/hardware/HardwareBuffer.YCBCR_P010,54,Android.Hardware.HardwareBufferFormat,YcbcrP010,remove,
 E,36,android/hardware/HardwareBuffer.YCBCR_P210,60,Android.Hardware.HardwareBufferFormat,YcbcrP210,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_BLUETOOTH,5,Android.Hardware.Hid.HidDeviceTransport,Bluetooth,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_I2C,24,Android.Hardware.Hid.HidDeviceTransport,I2c,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_SPI,28,Android.Hardware.Hid.HidDeviceTransport,Spi,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_UNKNOWN,0,Android.Hardware.Hid.HidDeviceTransport,Unknown,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_USB,3,Android.Hardware.Hid.HidDeviceTransport,Usb,remove,
+E,37.1,android/hardware/hid/HidDevice.TRANSPORT_VIRTUAL,6,Android.Hardware.Hid.HidDeviceTransport,Virtual,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_BACK,8,Android.Hardware.Input.CustomizableButton,Back,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_EXTRA,128,Android.Hardware.Input.CustomizableButton,Extra,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_FORWARD,16,Android.Hardware.Input.CustomizableButton,Forward,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_SIDE,256,Android.Hardware.Input.CustomizableButton,Side,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_TASK,512,Android.Hardware.Input.CustomizableButton,Task,remove,
+E,37.1,android/hardware/input/ButtonCustomizationTrigger.CUSTOMIZABLE_BUTTON_TERTIARY,4,Android.Hardware.Input.CustomizableButton,Tertiary,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_ASSIST,219,Android.Hardware.Input.CustomizableKeyCode,Assist,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_BACK,4,Android.Hardware.Input.CustomizableKeyCode,Back,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_BOOKMARK,174,Android.Hardware.Input.CustomizableKeyCode,Bookmark,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_BRIGHTNESS_DOWN,220,Android.Hardware.Input.CustomizableKeyCode,BrightnessDown,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_BRIGHTNESS_UP,221,Android.Hardware.Input.CustomizableKeyCode,BrightnessUp,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_CALCULATOR,210,Android.Hardware.Input.CustomizableKeyCode,Calculator,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_CALENDAR,208,Android.Hardware.Input.CustomizableKeyCode,Calendar,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_CAMERA,27,Android.Hardware.Input.CustomizableKeyCode,Camera,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_CONTACTS,207,Android.Hardware.Input.CustomizableKeyCode,Contacts,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_DICTATE,319,Android.Hardware.Input.CustomizableKeyCode,Dictate,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_ENVELOPE,65,Android.Hardware.Input.CustomizableKeyCode,Envelope,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_EXPLORER,64,Android.Hardware.Input.CustomizableKeyCode,Explorer,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F1,131,Android.Hardware.Input.CustomizableKeyCode,F1,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F10,140,Android.Hardware.Input.CustomizableKeyCode,F10,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F11,141,Android.Hardware.Input.CustomizableKeyCode,F11,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F12,142,Android.Hardware.Input.CustomizableKeyCode,F12,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F13,326,Android.Hardware.Input.CustomizableKeyCode,F13,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F14,327,Android.Hardware.Input.CustomizableKeyCode,F14,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F15,328,Android.Hardware.Input.CustomizableKeyCode,F15,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F16,329,Android.Hardware.Input.CustomizableKeyCode,F16,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F17,330,Android.Hardware.Input.CustomizableKeyCode,F17,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F18,331,Android.Hardware.Input.CustomizableKeyCode,F18,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F19,332,Android.Hardware.Input.CustomizableKeyCode,F19,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F2,132,Android.Hardware.Input.CustomizableKeyCode,F2,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F20,333,Android.Hardware.Input.CustomizableKeyCode,F20,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F21,334,Android.Hardware.Input.CustomizableKeyCode,F21,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F22,335,Android.Hardware.Input.CustomizableKeyCode,F22,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F23,336,Android.Hardware.Input.CustomizableKeyCode,F23,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F24,337,Android.Hardware.Input.CustomizableKeyCode,F24,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F3,133,Android.Hardware.Input.CustomizableKeyCode,F3,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F4,134,Android.Hardware.Input.CustomizableKeyCode,F4,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F5,135,Android.Hardware.Input.CustomizableKeyCode,F5,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F6,136,Android.Hardware.Input.CustomizableKeyCode,F6,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F7,137,Android.Hardware.Input.CustomizableKeyCode,F7,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F8,138,Android.Hardware.Input.CustomizableKeyCode,F8,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_F9,139,Android.Hardware.Input.CustomizableKeyCode,F9,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_FORWARD,125,Android.Hardware.Input.CustomizableKeyCode,Forward,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_FULLSCREEN,325,Android.Hardware.Input.CustomizableKeyCode,Fullscreen,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MEDIA_EJECT,129,Android.Hardware.Input.CustomizableKeyCode,MediaEject,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MEDIA_NEXT,87,Android.Hardware.Input.CustomizableKeyCode,MediaNext,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MEDIA_PLAY_PAUSE,85,Android.Hardware.Input.CustomizableKeyCode,MediaPlayPause,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MEDIA_PREVIOUS,88,Android.Hardware.Input.CustomizableKeyCode,MediaPrevious,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MEDIA_STOP,86,Android.Hardware.Input.CustomizableKeyCode,MediaStop,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MENU,82,Android.Hardware.Input.CustomizableKeyCode,Menu,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MOVE_HOME,122,Android.Hardware.Input.CustomizableKeyCode,MoveHome,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_MUSIC,209,Android.Hardware.Input.CustomizableKeyCode,Music,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_NEW,320,Android.Hardware.Input.CustomizableKeyCode,New,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_SCREENSHOT,318,Android.Hardware.Input.CustomizableKeyCode,Screenshot,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_SEARCH,84,Android.Hardware.Input.CustomizableKeyCode,Search,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_SYSRQ,120,Android.Hardware.Input.CustomizableKeyCode,Sysrq,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_VOLUME_DOWN,25,Android.Hardware.Input.CustomizableKeyCode,VolumeDown,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_VOLUME_MUTE,164,Android.Hardware.Input.CustomizableKeyCode,VolumeMute,remove,
+E,37.1,android/hardware/input/KeyCustomizationTrigger.CUSTOMIZABLE_KEYCODE_VOLUME_UP,24,Android.Hardware.Input.CustomizableKeyCode,VolumeUp,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_ASSIST,21,Android.Hardware.Input.SimpleCustomizationActionType,Assist,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_BACK,1,Android.Hardware.Input.SimpleCustomizationActionType,Back,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_BRIGHTNESS_DOWN,2,Android.Hardware.Input.SimpleCustomizationActionType,BrightnessDown,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_BRIGHTNESS_UP,3,Android.Hardware.Input.SimpleCustomizationActionType,BrightnessUp,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_CALCULATOR,4,Android.Hardware.Input.SimpleCustomizationActionType,Calculator,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_CLOSE_WINDOW,19,Android.Hardware.Input.SimpleCustomizationActionType,CloseWindow,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_CONTEXTUAL_INSERT,22,Android.Hardware.Input.SimpleCustomizationActionType,ContextualInsert,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_CONTEXTUAL_QUERY,24,Android.Hardware.Input.SimpleCustomizationActionType,ContextualQuery,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_CONTEXTUAL_SEARCH,23,Android.Hardware.Input.SimpleCustomizationActionType,ContextualSearch,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_DICTATION,5,Android.Hardware.Input.SimpleCustomizationActionType,Dictation,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_DO_NOTHING,18,Android.Hardware.Input.SimpleCustomizationActionType,DoNothing,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_EMOJI_MENU,6,Android.Hardware.Input.SimpleCustomizationActionType,EmojiMenu,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_FORWARD,7,Android.Hardware.Input.SimpleCustomizationActionType,Forward,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_LOCK,8,Android.Hardware.Input.SimpleCustomizationActionType,Lock,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_MEDIA_NEXT,9,Android.Hardware.Input.SimpleCustomizationActionType,MediaNext,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_MEDIA_PLAY_PAUSE,10,Android.Hardware.Input.SimpleCustomizationActionType,MediaPlayPause,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_MEDIA_PREVIOUS,11,Android.Hardware.Input.SimpleCustomizationActionType,MediaPrevious,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_PARTIAL_SCREENSHOT,20,Android.Hardware.Input.SimpleCustomizationActionType,PartialScreenshot,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_PRINT_SCREEN,12,Android.Hardware.Input.SimpleCustomizationActionType,PrintScreen,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_SCREEN_CAPTURE,13,Android.Hardware.Input.SimpleCustomizationActionType,ScreenCapture,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_SHOW_DESKTOP,14,Android.Hardware.Input.SimpleCustomizationActionType,ShowDesktop,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_VOICE_ASSIST,25,Android.Hardware.Input.SimpleCustomizationActionType,VoiceAssist,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_VOLUME_DOWN,15,Android.Hardware.Input.SimpleCustomizationActionType,VolumeDown,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_VOLUME_MUTE,16,Android.Hardware.Input.SimpleCustomizationActionType,VolumeMute,remove,
+E,37.1,android/hardware/input/SimpleCustomizationAction.TYPE_VOLUME_UP,17,Android.Hardware.Input.SimpleCustomizationActionType,VolumeUp,remove,
+E,37.1,android/hardware/input/UriCustomizationAction.TYPE_OPEN_FILE,1,Android.Hardware.Input.UriCustomizationActionType,OpenFile,remove,
+E,37.1,android/hardware/input/UriCustomizationAction.TYPE_OPEN_FOLDER,2,Android.Hardware.Input.UriCustomizationActionType,OpenFolder,remove,
+E,37.1,android/hardware/input/UriCustomizationAction.TYPE_OPEN_URL,3,Android.Hardware.Input.UriCustomizationActionType,OpenUrl,remove,
 E,37,android/hardware/lights/ColorSequence.INTERPOLATION_MODE_LINEAR,1,Android.Hardware.Lights.InterpolationMode,Linear,remove,
 E,37,android/hardware/lights/ColorSequence.INTERPOLATION_MODE_NONE,0,Android.Hardware.Lights.InterpolationMode,None,remove,
 E,37,android/hardware/lights/Light.LIGHT_CAPABILITY_ANIMATION,4,Android.Hardware.Lights.LightCapability,Animation,remove,flags
@@ -3639,6 +3732,9 @@ E,35,android/health/connect/datatypes/PlannedExerciseStep.EXERCISE_CATEGORY_RECO
 E,35,android/health/connect/datatypes/PlannedExerciseStep.EXERCISE_CATEGORY_REST,2,Android.Health.Connect.DataTypes.PlannedExerciseStepExerciseCategory,Rest,remove,
 E,35,android/health/connect/datatypes/PlannedExerciseStep.EXERCISE_CATEGORY_UNKNOWN,0,Android.Health.Connect.DataTypes.PlannedExerciseStepExerciseCategory,Unknown,remove,
 E,35,android/health/connect/datatypes/PlannedExerciseStep.EXERCISE_CATEGORY_WARMUP,1,Android.Health.Connect.DataTypes.PlannedExerciseStepExerciseCategory,Warmup,remove,
+E,37.1,android/health/connect/datatypes/Record.RECORD_TEMPORAL_TYPE_INSTANT,0,Android.Health.Connect.Datatypes.RecordTemporalType,Instant,remove,
+E,37.1,android/health/connect/datatypes/Record.RECORD_TEMPORAL_TYPE_INTERVAL,1,Android.Health.Connect.Datatypes.RecordTemporalType,Interval,remove,
+E,37.1,android/health/connect/datatypes/Record.RECORD_TEMPORAL_TYPE_LOCAL_DATE,2,Android.Health.Connect.Datatypes.RecordTemporalType,LocalDate,remove,
 E,34,android/health/connect/datatypes/SexualActivityRecord$SexualActivityProtectionUsed.PROTECTION_USED_PROTECTED,1,Android.Health.Connect.DataTypes.SexualActivityProtectionUsedType,Protected,remove,
 E,34,android/health/connect/datatypes/SexualActivityRecord$SexualActivityProtectionUsed.PROTECTION_USED_UNKNOWN,0,Android.Health.Connect.DataTypes.SexualActivityProtectionUsedType,Unknown,remove,
 E,34,android/health/connect/datatypes/SexualActivityRecord$SexualActivityProtectionUsed.PROTECTION_USED_UNPROTECTED,2,Android.Health.Connect.DataTypes.SexualActivityProtectionUsedType,Unprotected,remove,
@@ -9465,6 +9561,7 @@ E,36.1,android/os/Build$VERSION_CODES_FULL.BAKLAVA_1,3600001,Android.OS.BuildVer
 E,36,android/os/Build$VERSION_CODES_FULL.BASE,100000,Android.OS.BuildVersionCodesFull,Base,remove,
 E,36,android/os/Build$VERSION_CODES_FULL.BASE_1_1,200000,Android.OS.BuildVersionCodesFull,Base11,remove,
 E,37,android/os/Build$VERSION_CODES_FULL.CINNAMON_BUN,3700000,Android.OS.BuildVersionCodesFull,CinnamonBun,remove,
+E,37.1,android/os/Build$VERSION_CODES_FULL.CINNAMON_BUN_1,3700001,Android.OS.BuildVersionCodesFull,CinnamonBun1,remove,
 E,36,android/os/Build$VERSION_CODES_FULL.CUPCAKE,300000,Android.OS.BuildVersionCodesFull,Cupcake,remove,
 E,36,android/os/Build$VERSION_CODES_FULL.DONUT,400000,Android.OS.BuildVersionCodesFull,Donut,remove,
 E,36,android/os/Build$VERSION_CODES_FULL.ECLAIR,500000,Android.OS.BuildVersionCodesFull,Eclair,remove,
@@ -10050,6 +10147,7 @@ E,24,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_REMOVE,1024,Andro
 E,21,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_RENAME,64,Android.Provider.DocumentContractFlags,SupportsRename,remove,
 E,37,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_RESTORE,131072,Android.Provider.DocumentContractFlags,SupportsRestore,remove,
 E,26,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_SETTINGS,2048,Android.Provider.DocumentContractFlags,SupportsSettings,remove,
+E,37.1,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_SUBTREE_SEARCH,262144,Android.Provider.DocumentContractFlags,SupportsSubtreeSearch,remove,flags
 E,19,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_THUMBNAIL,1,Android.Provider.DocumentContractFlags,SupportsThumbnail,remove,
 E,37,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_TRASH,65536,Android.Provider.DocumentContractFlags,SupportsTrash,remove,
 E,19,android/provider/DocumentsContract$Document.FLAG_SUPPORTS_WRITE,2,Android.Provider.DocumentContractFlags,SupportsWrite,remove,
@@ -13729,6 +13827,8 @@ E,23,android/telecom/Call$Details.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,30
 E,23,android/telecom/Call$Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX,1024,Android.Telecom.CallCapability,SupportsVtRemoteRx,keep,
 E,23,android/telecom/Call$Details.CAPABILITY_SUPPORTS_VT_REMOTE_TX,2048,Android.Telecom.CallCapability,SupportsVtRemoteTx,keep,
 E,23,android/telecom/Call$Details.CAPABILITY_SWAP_CONFERENCE,8,Android.Telecom.CallCapability,SwapConference,keep,
+E,37.1,android/telecom/Call$Details.CAPABILITY_TRANSFER,67108864,Android.Telecom.CallCapability,Transfer,remove,
+E,37.1,android/telecom/Call$Details.CAPABILITY_TRANSFER_CONSULTATIVE,134217728,Android.Telecom.CallCapability,TransferConsultative,remove,
 E,29,android/telecom/Call$Details.DIRECTION_INCOMING,0,Android.Telecom.CallDirection,Incoming,remove,
 E,29,android/telecom/Call$Details.DIRECTION_OUTGOING,1,Android.Telecom.CallDirection,Outgoing,remove,
 E,29,android/telecom/Call$Details.DIRECTION_UNKNOWN,-1,Android.Telecom.CallDirection,Unknown,remove,
@@ -13895,6 +13995,7 @@ E,23,android/telecom/PhoneAccount.CAPABILITY_CALL_PROVIDER,2,Android.Telecom.Pho
 E,23,android/telecom/PhoneAccount.CAPABILITY_CALL_SUBJECT,64,Android.Telecom.PhoneAccountCapability,CallSubject,keep,
 E,37,android/telecom/PhoneAccount.CAPABILITY_CHANGE_RTT_CALL_TO_AUDIO_CALL,1048576,Android.Telecom.PhoneAccountCapability,ChangeRttCallToAudioCall,remove,
 E,23,android/telecom/PhoneAccount.CAPABILITY_CONNECTION_MANAGER,1,Android.Telecom.PhoneAccountCapability,ConnectionManager,keep,
+E,37.1,android/telecom/PhoneAccount.CAPABILITY_OPT_OUT_OF_PREMIUM_NETWORK,2097152,Android.Telecom.PhoneAccountCapability,OptOutOfPremiumNetwork,remove,
 E,23,android/telecom/PhoneAccount.CAPABILITY_PLACE_EMERGENCY_CALLS,16,Android.Telecom.PhoneAccountCapability,PlaceEmergencyCalls,keep,
 E,26,android/telecom/PhoneAccount.CAPABILITY_RTT,4096,Android.Telecom.PhoneAccountCapability,Rtt,keep,
 E,26,android/telecom/PhoneAccount.CAPABILITY_SELF_MANAGED,2048,Android.Telecom.PhoneAccountCapability,SelfManaged,keep,
@@ -16238,6 +16339,7 @@ E,36,android/view/KeyEvent.KEYCODE_CLOSE,321,Android.Views.Keycode,Close,remove,
 E,10,android/view/KeyEvent.KEYCODE_COMMA,55,Android.Views.Keycode,Comma,keep,
 E,15,android/view/KeyEvent.KEYCODE_CONTACTS,207,Android.Views.Keycode,Contacts,keep,
 E,37,android/view/KeyEvent.KEYCODE_CONTEXTUAL_INSERT,340,Android.Views.Keycode,ContextualInsert,remove,
+E,37.1,android/view/KeyEvent.KEYCODE_CONTEXTUAL_QUERY,341,Android.Views.Keycode,ContextualQuery,remove,
 E,37,android/view/KeyEvent.KEYCODE_CONTEXTUAL_SEARCH,339,Android.Views.Keycode,ContextualSearch,remove,
 E,24,android/view/KeyEvent.KEYCODE_COPY,278,Android.Views.Keycode,Copy,keep,
 E,15,android/view/KeyEvent.KEYCODE_CTRL_LEFT,113,Android.Views.Keycode,CtrlLeft,keep,
@@ -17193,6 +17295,12 @@ E,10,android/widget/ListView.CHOICE_MODE_NONE,0,Android.Widget.ChoiceMode,None,r
 E,10,android/widget/ListView.CHOICE_MODE_SINGLE,1,Android.Widget.ChoiceMode,Single,remove,
 I,29,android/widget/Magnifier.SOURCE_BOUND_MAX_IN_SURFACE,0,,,,
 I,29,android/widget/Magnifier.SOURCE_BOUND_MAX_VISIBLE,1,,,,
+E,37.1,android/widget/photopicker/EmbeddedPhotoPickerFeatureInfo.TAB_ALBUMS,0,Android.Widget.Photopicker.EmbeddedPhotoPickerLaunchTab,Albums,remove,
+E,37.1,android/widget/photopicker/EmbeddedPhotoPickerFeatureInfo.TAB_IMAGES,1,Android.Widget.Photopicker.EmbeddedPhotoPickerLaunchTab,Images,remove,
+E,37.1,android/widget/photopicker/EmbeddedPhotoPickerFeatureInfo.TAB_UNSET,-1,Android.Widget.Photopicker.EmbeddedPhotoPickerLaunchTab,Unset,remove,
+R,37.1,android/widget/photopicker/EmbeddedPhotoPickerUiCustomizationParams.ASPECT_RATIO_PORTRAIT_9_16,1,,,remove,
+R,37.1,android/widget/photopicker/EmbeddedPhotoPickerUiCustomizationParams.ASPECT_RATIO_SQUARE_1_1,0,,,remove,
+R,37.1,android/widget/photopicker/EmbeddedPhotoPickerUiCustomizationParams.ASPECT_RATIO_UNDEFINED,-1,,,remove,
 E,37,android/widget/photopicker/PhotoPickerUiCustomizationParams.ASPECT_RATIO_PORTRAIT_9_16,1,Android.Widget.Photopicker.AspectRatio,Portrait916,remove,
 E,37,android/widget/photopicker/PhotoPickerUiCustomizationParams.ASPECT_RATIO_SQUARE_1_1,0,Android.Widget.Photopicker.AspectRatio,Square11,remove,
 E,37,android/widget/photopicker/PhotoPickerUiCustomizationParams.ASPECT_RATIO_UNDEFINED,-1,Android.Widget.Photopicker.AspectRatio,Undefined,remove,
diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv
index bab127e450d..2bfde0f4f34 100644
--- a/src/Mono.Android/methodmap.csv
+++ b/src/Mono.Android/methodmap.csv
@@ -4637,3 +4637,19 @@
 37,android/widget/photopicker,PhotoPickerUiCustomizationParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags
 37,android/widget/photopicker,PhotoPickerUiCustomizationParams$Builder,setAspectRatio,aspectRatio,Android.Widget.Photopicker.AspectRatio
 37,android/widget,RemoteViews,setViewPadding,units,Android.Util.ComplexUnitType
+37.1,android.hardware.hid,HidDevice,getTransport,return,Android.Hardware.Hid.HidDeviceTransport
+37.1,android.hardware.input,ButtonCustomizationTrigger,ctor,buttonCode,Android.Hardware.Input.CustomizableButton
+37.1,android.hardware.input,ButtonCustomizationTrigger,getButtonCode,return,Android.Hardware.Input.CustomizableButton
+37.1,android.hardware.input,InputManager,isButtonAllowedForCustomization,buttonCode,Android.Hardware.Input.CustomizableButton
+37.1,android.hardware.input,InputManager,isKeyAllowedForCustomization,keyCode,Android.Hardware.Input.CustomizableKeyCode
+37.1,android.hardware.input,KeyCustomizationTrigger,ctor,keyCode,Android.Hardware.Input.CustomizableKeyCode
+37.1,android.hardware.input,KeyCustomizationTrigger,getKeyCode,return,Android.Hardware.Input.CustomizableKeyCode
+37.1,android.hardware.input,SimpleCustomizationAction,ctor,actionType,Android.Hardware.Input.SimpleCustomizationActionType
+37.1,android.hardware.input,SimpleCustomizationAction,getType,return,Android.Hardware.Input.SimpleCustomizationActionType
+37.1,android.hardware.input,UriCustomizationAction,ctor,actionType,Android.Hardware.Input.UriCustomizationActionType
+37.1,android.hardware.input,UriCustomizationAction,getType,return,Android.Hardware.Input.UriCustomizationActionType
+37.1,android.widget.photopicker,EmbeddedPhotoPickerFeatureInfo,getLaunchTab,return,Android.Widget.Photopicker.EmbeddedPhotoPickerLaunchTab
+37.1,android.widget.photopicker,EmbeddedPhotoPickerFeatureInfo.Builder,setLaunchTab,launchTab,Android.Widget.Photopicker.EmbeddedPhotoPickerLaunchTab
+37.1,android.widget.photopicker,EmbeddedPhotoPickerUiCustomizationParams,getAspectRatio,return,Android.Widget.Photopicker.AspectRatio
+37.1,android.widget.photopicker,EmbeddedPhotoPickerUiCustomizationParams,writeToParcel,flags,Android.OS.ParcelableWriteFlags
+37.1,android.widget.photopicker,EmbeddedPhotoPickerUiCustomizationParams.Builder,setAspectRatio,aspectRatio,Android.Widget.Photopicker.AspectRatio

From e84783edba9561a8c2aee2ee58b304485aab797d Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 20 Aug 2026 10:34:45 -0500
Subject: [PATCH 2/3] [Mono.Android] Restore manifest API history

Restore the pre-37 manifest definitions and required metadata entries that were lost when API 37.1 was regenerated from an incomplete platform set.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 .../manifest-definition.xml                   | 1133 +++++++++--------
 .../manifest-attribute-codegen/metadata.xml   |    4 +
 2 files changed, 573 insertions(+), 564 deletions(-)

diff --git a/build-tools/manifest-attribute-codegen/manifest-definition.xml b/build-tools/manifest-attribute-codegen/manifest-definition.xml
index 144ec459b04..cc10d5b1041 100644
--- a/build-tools/manifest-attribute-codegen/manifest-definition.xml
+++ b/build-tools/manifest-attribute-codegen/manifest-definition.xml
@@ -1,100 +1,101 @@
 <m>
-    <e name='manifest' api-level='35'>
-        <a name='versionCode' api-level='35' />
-        <a name='versionCodeMajor' api-level='35' />
-        <a name='versionName' api-level='35' />
-        <a name='revisionCode' api-level='35' />
-        <a name='sharedUserId' api-level='35' />
-        <a name='sharedUserLabel' api-level='35' />
-        <a name='sharedUserMaxSdkVersion' api-level='35' />
-        <a name='installLocation' api-level='35' />
-        <a name='isolatedSplits' api-level='35' />
-        <a name='isFeatureSplit' api-level='35' />
-        <a name='targetSandboxVersion' api-level='35' />
-        <a name='compileSdkVersion' api-level='35' />
-        <a name='compileSdkVersionCodename' api-level='35' />
-        <a name='isSplitRequired' api-level='35' />
-        <a name='requiredSplitTypes' api-level='35' />
-        <a name='splitTypes' api-level='35' />
-    </e>
-    <e name='application' api-level='35'>
+    <e name='manifest' api-level='10'>
+        <a name='versionCode' />
+        <a name='versionName' />
+        <a name='sharedUserId' />
+        <a name='sharedUserLabel' />
+        <a name='installLocation' />
+        <a name='revisionCode' api-level='22' />
+        <a name='isolatedSplits' api-level='26' />
+        <a name='isFeatureSplit' api-level='26' />
+        <a name='targetSandboxVersion' api-level='26' />
+        <a name='versionCodeMajor' api-level='28' />
+        <a name='compileSdkVersion' api-level='28' />
+        <a name='compileSdkVersionCodename' api-level='28' />
+        <a name='isSplitRequired' api-level='29' />
+        <a name='sharedUserMaxSdkVersion' api-level='33' />
+        <a name='requiredSplitTypes' api-level='33' />
+        <a name='splitTypes' api-level='33' />
+    </e>
+    <e name='application' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='theme' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='process' api-level='35' />
-        <a name='taskAffinity' api-level='35' />
-        <a name='allowTaskReparenting' api-level='35' />
-        <a name='hasCode' format='boolean' api-level='35' />
+        <a name='name' />
+        <a name='theme' />
+        <a name='label' />
+        <a name='icon' />
+        <a name='description' />
+        <a name='permission' />
+        <a name='process' />
+        <a name='taskAffinity' />
+        <a name='allowTaskReparenting' />
+        <a name='hasCode' format='boolean' />
+        <a name='persistent' />
+        <a name='enabled' />
+        <a name='debuggable' />
+        <a name='vmSafeMode' />
+        <a name='manageSpaceActivity' />
+        <a name='allowClearUserData' />
+        <a name='testOnly' />
+        <a name='backupAgent' />
+        <a name='allowBackup' />
+        <a name='killAfterRestore' />
+        <a name='restoreNeedsApplication' />
+        <a name='restoreAnyVersion' />
+        <a name='neverEncrypt' />
+        <a name='cantSaveState' format='boolean' />
+        <a name='logo' api-level='15' />
+        <a name='hardwareAccelerated' api-level='15' />
+        <a name='largeHeap' format='boolean' api-level='15' />
+        <a name='uiOptions' api-level='15' />
+        <a name='supportsRtl' format='boolean' api-level='16' />
+        <a name='requiredForAllUsers' api-level='18' />
+        <a name='restrictedAccountType' format='string' api-level='18' />
+        <a name='requiredAccountType' format='string' api-level='18' />
+        <a name='banner' api-level='20' />
+        <a name='isGame' api-level='20' />
+        <a name='fullBackupOnly' api-level='21' />
+        <a name='multiArch' api-level='21' />
+        <a name='fullBackupContent' api-level='23' />
+        <a name='usesCleartextTraffic' api-level='23' />
+        <a name='extractNativeLibs' api-level='23' />
+        <a name='backupInForeground' api-level='24' />
+        <a name='defaultToDeviceProtectedStorage' format='boolean' api-level='24' />
+        <a name='directBootAware' api-level='24' />
+        <a name='resizeableActivity' api-level='24' />
+        <a name='networkSecurityConfig' api-level='24' />
+        <a name='roundIcon' api-level='25' />
+        <a name='persistentWhenFeatureAvailable' api-level='26' />
+        <a name='maxAspectRatio' api-level='26' />
+        <a name='appCategory' api-level='26' />
+        <a name='classLoader' api-level='27' />
+        <a name='appComponentFactory' api-level='28' />
+        <a name='useEmbeddedDex' api-level='29' />
+        <a name='minAspectRatio' api-level='29' />
+        <a name='usesNonSdkApi' api-level='29' />
+        <a name='hasFragileUserData' format='boolean' api-level='29' />
+        <a name='zygotePreloadName' api-level='29' />
+        <a name='allowClearUserDataOnFailedRestore' format='boolean' api-level='29' />
+        <a name='allowAudioPlaybackCapture' format='boolean' api-level='29' />
+        <a name='requestLegacyExternalStorage' format='boolean' api-level='29' />
+        <a name='preserveLegacyExternalStorage' format='boolean' api-level='30' />
+        <a name='forceQueryable' format='boolean' api-level='30' />
+        <a name='crossProfile' format='boolean' api-level='30' />
+        <a name='allowNativeHeapPointerTagging' format='boolean' api-level='30' />
+        <a name='gwpAsanMode' api-level='30' />
+        <a name='allowAutoRevokePermissionsExemption' format='boolean' api-level='30' />
+        <a name='autoRevokePermissions' api-level='30' />
+        <a name='requestRawExternalStorageAccess' format='boolean' api-level='31' />
+        <a name='memtagMode' api-level='31' />
+        <a name='nativeHeapZeroInitialized' format='boolean' api-level='31' />
+        <a name='rollbackDataPolicy' api-level='31' />
+        <a name='dataExtractionRules' format='reference' api-level='31' />
+        <a name='requestForegroundServiceExemption' format='boolean' api-level='31' />
+        <a name='attributionsAreUserVisible' format='boolean' api-level='31' />
+        <a name='localeConfig' api-level='33' />
+        <a name='resetEnabledSettingsOnAppDataCleared' format='boolean' api-level='33' />
+        <a name='knownActivityEmbeddingCerts' api-level='33' />
+        <a name='enableOnBackInvokedCallback' format='boolean' api-level='33' />
         <a name='allowCrossUidActivitySwitchFromBelow' format='boolean' api-level='35' />
-        <a name='persistent' api-level='35' />
-        <a name='persistentWhenFeatureAvailable' api-level='35' />
-        <a name='requiredForAllUsers' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='debuggable' api-level='35' />
-        <a name='vmSafeMode' api-level='35' />
-        <a name='hardwareAccelerated' api-level='35' />
-        <a name='manageSpaceActivity' api-level='35' />
-        <a name='allowClearUserData' api-level='35' />
-        <a name='testOnly' api-level='35' />
-        <a name='backupAgent' api-level='35' />
-        <a name='allowBackup' api-level='35' />
-        <a name='fullBackupOnly' api-level='35' />
-        <a name='fullBackupContent' api-level='35' />
-        <a name='killAfterRestore' api-level='35' />
-        <a name='restoreNeedsApplication' api-level='35' />
-        <a name='restoreAnyVersion' api-level='35' />
-        <a name='backupInForeground' api-level='35' />
-        <a name='largeHeap' format='boolean' api-level='35' />
-        <a name='cantSaveState' format='boolean' api-level='35' />
-        <a name='uiOptions' api-level='35' />
-        <a name='supportsRtl' format='boolean' api-level='35' />
-        <a name='restrictedAccountType' format='string' api-level='35' />
-        <a name='requiredAccountType' format='string' api-level='35' />
-        <a name='isGame' api-level='35' />
-        <a name='usesCleartextTraffic' api-level='35' />
-        <a name='multiArch' api-level='35' />
-        <a name='useEmbeddedDex' api-level='35' />
-        <a name='extractNativeLibs' api-level='35' />
-        <a name='defaultToDeviceProtectedStorage' format='boolean' api-level='35' />
-        <a name='directBootAware' api-level='35' />
-        <a name='resizeableActivity' api-level='35' />
-        <a name='maxAspectRatio' api-level='35' />
-        <a name='minAspectRatio' api-level='35' />
-        <a name='networkSecurityConfig' api-level='35' />
-        <a name='localeConfig' api-level='35' />
-        <a name='appCategory' api-level='35' />
-        <a name='classLoader' api-level='35' />
-        <a name='appComponentFactory' api-level='35' />
-        <a name='usesNonSdkApi' api-level='35' />
-        <a name='hasFragileUserData' format='boolean' api-level='35' />
-        <a name='zygotePreloadName' api-level='35' />
-        <a name='allowClearUserDataOnFailedRestore' format='boolean' api-level='35' />
-        <a name='allowAudioPlaybackCapture' format='boolean' api-level='35' />
-        <a name='requestLegacyExternalStorage' format='boolean' api-level='35' />
-        <a name='preserveLegacyExternalStorage' format='boolean' api-level='35' />
-        <a name='requestRawExternalStorageAccess' format='boolean' api-level='35' />
-        <a name='forceQueryable' format='boolean' api-level='35' />
-        <a name='crossProfile' format='boolean' api-level='35' />
-        <a name='allowNativeHeapPointerTagging' format='boolean' api-level='35' />
-        <a name='gwpAsanMode' api-level='35' />
-        <a name='memtagMode' api-level='35' />
-        <a name='nativeHeapZeroInitialized' format='boolean' api-level='35' />
-        <a name='allowAutoRevokePermissionsExemption' format='boolean' api-level='35' />
-        <a name='autoRevokePermissions' api-level='35' />
-        <a name='rollbackDataPolicy' api-level='35' />
-        <a name='dataExtractionRules' format='reference' api-level='35' />
-        <a name='requestForegroundServiceExemption' format='boolean' api-level='35' />
-        <a name='attributionsAreUserVisible' format='boolean' api-level='35' />
-        <a name='resetEnabledSettingsOnAppDataCleared' format='boolean' api-level='35' />
-        <a name='knownActivityEmbeddingCerts' api-level='35' />
-        <a name='enableOnBackInvokedCallback' format='boolean' api-level='35' />
         <a name='pageSizeCompat' api-level='36.1' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='alternateLauncherIcons' format='reference' api-level='36.1' />
@@ -103,408 +104,300 @@
         <a name='zygotePreloadNativeLib' api-level='37.0' />
         <a name='zygotePreloadNativeFunc' api-level='37.0' />
     </e>
-    <e name='attribution' api-level='35'>
-        <parent>manifest</parent>
-        <a name='tag' format='string' api-level='35' />
-        <a name='label' format='string' api-level='35' />
-    </e>
-    <e name='attribution-inherit-from' api-level='35'>
-        <parent>attribution</parent>
-        <a name='tag' format='string' api-level='35' />
-    </e>
-    <e name='permission' api-level='35'>
+    <e name='permission' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='permissionGroup' api-level='35' />
-        <a name='backgroundPermission' format='string' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='request' api-level='35' />
-        <a name='protectionLevel' api-level='35' />
-        <a name='permissionFlags' api-level='35' />
-        <a name='knownCerts' api-level='35' />
-        <a name='maxSdkVersion' api-level='35' />
+        <a name='name' />
+        <a name='label' />
+        <a name='icon' />
+        <a name='permissionGroup' />
+        <a name='description' />
+        <a name='protectionLevel' />
+        <a name='logo' api-level='15' />
+        <a name='permissionFlags' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='roundIcon' api-level='25' />
+        <a name='request' api-level='28' />
+        <a name='backgroundPermission' format='string' api-level='29' />
+        <a name='knownCerts' api-level='31' />
+        <a name='maxSdkVersion' api-level='34' />
         <a name='requiresPurpose' format='boolean' api-level='36.1' />
         <a name='requiresPurposeTargetSdkVersion' format='integer' api-level='36.1' />
         <a name='requiresGeneralPurposeTargetSdkVersion' format='integer' api-level='37.0' />
         <a name='requiresPurposeStringTargetSdkVersion' format='integer' api-level='37.0' />
     </e>
-    <e name='permission-group' api-level='35'>
+    <e name='permission-group' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='request' format='string' api-level='35' />
-        <a name='requestDetail' format='string' api-level='35' />
-        <a name='backgroundRequest' format='string' api-level='35' />
-        <a name='backgroundRequestDetail' format='string' api-level='35' />
-        <a name='permissionGroupFlags' api-level='35' />
-        <a name='priority' api-level='35' />
-    </e>
-    <e name='permission-tree' api-level='35'>
+        <a name='name' />
+        <a name='label' />
+        <a name='icon' />
+        <a name='description' />
+        <a name='logo' api-level='15' />
+        <a name='priority' api-level='16' />
+        <a name='permissionGroupFlags' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='roundIcon' api-level='25' />
+        <a name='request' api-level='28' />
+        <a name='requestDetail' format='string' api-level='29' />
+        <a name='backgroundRequest' format='string' api-level='29' />
+        <a name='backgroundRequestDetail' format='string' api-level='29' />
+    </e>
+    <e name='permission-tree' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-    </e>
-    <e name='uses-permission' api-level='35'>
+        <a name='name' />
+        <a name='label' />
+        <a name='icon' />
+        <a name='logo' api-level='15' />
+        <a name='banner' api-level='20' />
+        <a name='roundIcon' api-level='25' />
+    </e>
+    <e name='uses-permission' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='minSdkVersion' format='integer|string' api-level='35' />
-        <a name='maxSdkVersion' format='integer' api-level='35' />
-        <a name='requiredFeature' format='string' api-level='35' />
-        <a name='requiredNotFeature' format='string' api-level='35' />
-        <a name='usesPermissionFlags' api-level='35' />
+        <a name='name' />
+        <a name='maxSdkVersion' format='integer' api-level='19' />
+        <a name='requiredFeature' format='string' api-level='26' />
+        <a name='requiredNotFeature' format='string' api-level='26' />
+        <a name='usesPermissionFlags' api-level='31' />
+        <a name='minSdkVersion' format='integer|string' api-level='34' />
         <a name='purposeString' format='reference' api-level='37.0' />
     </e>
-    <e name='required-feature' api-level='35'>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='required-not-feature' api-level='35'>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='uses-configuration' api-level='35'>
+    <e name='uses-configuration' api-level='10'>
         <parent>manifest</parent>
-        <a name='reqTouchScreen' api-level='35' />
-        <a name='reqKeyboardType' api-level='35' />
-        <a name='reqHardKeyboard' api-level='35' />
-        <a name='reqNavigation' api-level='35' />
-        <a name='reqFiveWayNav' api-level='35' />
+        <a name='reqTouchScreen' />
+        <a name='reqKeyboardType' />
+        <a name='reqHardKeyboard' />
+        <a name='reqNavigation' />
+        <a name='reqFiveWayNav' />
     </e>
-    <e name='uses-feature' api-level='35'>
+    <e name='uses-feature' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='version' format='integer' api-level='35' />
-        <a name='glEsVersion' format='integer' api-level='35' />
-        <a name='required' format='boolean' api-level='35' />
-    </e>
-    <e name='feature-group' api-level='35'>
-        <a name='label' api-level='35' />
+        <a name='glEsVersion' format='integer' />
+        <a name='name' />
+        <a name='required' format='boolean' />
+        <a name='version' format='integer' api-level='24' />
     </e>
-    <e name='uses-sdk' api-level='35'>
+    <e name='uses-sdk' api-level='10'>
         <parent>manifest</parent>
-        <a name='minSdkVersion' format='integer|string' api-level='35' />
-        <a name='targetSdkVersion' format='integer|string' api-level='35' />
-        <a name='maxSdkVersion' api-level='35' />
-    </e>
-    <e name='extension-sdk' api-level='35'>
-        <a name='sdkVersion' format='integer' api-level='35' />
-        <a name='minExtensionVersion' format='integer' api-level='35' />
-    </e>
-    <e name='library' api-level='35'>
-        <parent>manifest</parent>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='queries' api-level='35'>
-        <parent>manifest</parent>
-    </e>
-    <e name='queries-package' api-level='35'>
-        <parent>queries</parent>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='queries-intent' api-level='35'>
-        <parent>queries</parent>
-    </e>
-    <e name='queries-provider' api-level='35'>
-        <parent>queries</parent>
-        <a name='authorities' api-level='35' />
-    </e>
-    <e name='sdk-library' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='versionMajor' format='integer' api-level='35' />
-    </e>
-    <e name='uses-sdk-library' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='versionMajor' format='integer' api-level='35' />
-        <a name='certDigest' format='string' api-level='35' />
-        <a name='optional' format='boolean' api-level='35' />
-    </e>
-    <e name='static-library' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='version' api-level='35' />
-        <a name='versionMajor' format='integer' api-level='35' />
-    </e>
-    <e name='uses-library' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='required' api-level='35' />
-    </e>
-    <e name='uses-native-library' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='required' api-level='35' />
+        <a name='minSdkVersion' format='integer|string' />
+        <a name='targetSdkVersion' format='integer|string' />
+        <a name='maxSdkVersion' format='integer' />
+        <a name='minSdkVersionFull' format='string' api-level='Baklava' />
     </e>
-    <e name='uses-static-library' api-level='35'>
+    <e name='uses-library' api-level='10'>
         <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='version' api-level='35' />
-        <a name='certDigest' format='string' api-level='35' />
+        <a name='name' />
+        <a name='required' />
     </e>
-    <e name='additional-certificate' api-level='35'>
-        <parent>uses-static-library</parent>
-        <a name='certDigest' api-level='35' />
-    </e>
-    <e name='uses-package' api-level='35'>
-        <parent>application</parent>
-        <a name='packageType' format='string' api-level='35' />
-        <a name='name' api-level='35' />
-        <a name='version' api-level='35' />
-        <a name='versionMajor' format='integer' api-level='35' />
-        <a name='certDigest' format='string' api-level='35' />
-    </e>
-    <e name='supports-screens' api-level='35'>
+    <e name='supports-screens' api-level='10'>
         <parent>manifest</parent>
-        <a name='requiresSmallestWidthDp' format='integer' api-level='35' />
-        <a name='compatibleWidthLimitDp' format='integer' api-level='35' />
-        <a name='largestWidthLimitDp' format='integer' api-level='35' />
-        <a name='smallScreens' format='boolean' api-level='35' />
-        <a name='normalScreens' format='boolean' api-level='35' />
-        <a name='largeScreens' format='boolean' api-level='35' />
-        <a name='xlargeScreens' format='boolean' api-level='35' />
-        <a name='resizeable' format='boolean' api-level='35' />
-        <a name='anyDensity' format='boolean' api-level='35' />
-    </e>
-    <e name='protected-broadcast' api-level='35'>
+        <a name='smallScreens' format='boolean' />
+        <a name='normalScreens' format='boolean' />
+        <a name='largeScreens' format='boolean' />
+        <a name='xlargeScreens' format='boolean' />
+        <a name='resizeable' format='boolean' />
+        <a name='anyDensity' format='boolean' />
+        <a name='requiresSmallestWidthDp' format='integer' api-level='15' />
+        <a name='compatibleWidthLimitDp' format='integer' api-level='15' />
+        <a name='largestWidthLimitDp' format='integer' api-level='15' />
+    </e>
+    <e name='protected-broadcast' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
+        <a name='name' />
     </e>
-    <e name='original-package' api-level='35'>
+    <e name='original-package' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
+        <a name='name' />
     </e>
-    <e name='processes' api-level='35'>
+    <e name='provider' api-level='10'>
         <parent>application</parent>
-    </e>
-    <e name='process' api-level='35'>
-        <parent>processes</parent>
-        <a name='process' api-level='35' />
-        <a name='name' api-level='35' />
-        <a name='gwpAsanMode' api-level='35' />
-        <a name='memtagMode' api-level='35' />
-        <a name='nativeHeapZeroInitialized' api-level='35' />
-        <a name='useEmbeddedDex' api-level='35' />
-        <a name='singleUser' api-level='37.1' />
-    </e>
-    <e name='deny-permission' api-level='35'>
-        <parent>processes</parent>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='allow-permission' api-level='35'>
-        <parent>processes</parent>
-        <a name='name' api-level='35' />
-    </e>
-    <e name='provider' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='process' api-level='35' />
-        <a name='authorities' api-level='35' />
-        <a name='syncable' api-level='35' />
-        <a name='readPermission' api-level='35' />
-        <a name='writePermission' api-level='35' />
-        <a name='grantUriPermissions' api-level='35' />
-        <a name='forceUriPermissions' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='multiprocess' api-level='35' />
-        <a name='initOrder' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='exported' api-level='35' />
-        <a name='singleUser' api-level='35' />
-        <a name='directBootAware' api-level='35' />
-        <a name='visibleToInstantApps' api-level='35' />
-        <a name='splitName' api-level='35' />
-        <a name='attributionTags' api-level='35' />
+        <a name='name' />
+        <a name='label' />
+        <a name='description' />
+        <a name='icon' />
+        <a name='process' />
+        <a name='authorities' />
+        <a name='syncable' />
+        <a name='readPermission' />
+        <a name='writePermission' />
+        <a name='grantUriPermissions' />
+        <a name='permission' />
+        <a name='multiprocess' />
+        <a name='initOrder' />
+        <a name='enabled' />
+        <a name='exported' />
+        <a name='logo' api-level='15' />
+        <a name='singleUser' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='directBootAware' api-level='24' />
+        <a name='roundIcon' api-level='25' />
+        <a name='visibleToInstantApps' api-level='26' />
+        <a name='splitName' api-level='26' />
+        <a name='forceUriPermissions' api-level='29' />
+        <a name='attributionTags' api-level='31' />
         <a name='systemUserOnly' format='boolean' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='grant-uri-permission' api-level='35'>
+    <e name='grant-uri-permission' api-level='10'>
         <parent>provider</parent>
-        <a name='path' format='string' api-level='35' />
-        <a name='pathPrefix' format='string' api-level='35' />
-        <a name='pathPattern' format='string' api-level='35' />
-        <a name='pathAdvancedPattern' format='string' api-level='35' />
-        <a name='pathSuffix' format='string' api-level='35' />
+        <a name='path' format='string' />
+        <a name='pathPrefix' format='string' />
+        <a name='pathPattern' format='string' />
+        <a name='pathAdvancedPattern' format='string' api-level='31' />
+        <a name='pathSuffix' format='string' api-level='31' />
     </e>
-    <e name='path-permission' api-level='35'>
+    <e name='path-permission' api-level='10'>
         <parent>provider</parent>
-        <a name='path' api-level='35' />
-        <a name='pathPrefix' api-level='35' />
-        <a name='pathPattern' api-level='35' />
-        <a name='pathAdvancedPattern' format='string' api-level='35' />
-        <a name='pathSuffix' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='readPermission' api-level='35' />
-        <a name='writePermission' api-level='35' />
-    </e>
-    <e name='service' api-level='35'>
+        <a name='path' />
+        <a name='pathPrefix' />
+        <a name='pathPattern' />
+        <a name='permission' />
+        <a name='readPermission' />
+        <a name='writePermission' />
+        <a name='pathAdvancedPattern' api-level='26' />
+        <a name='pathSuffix' api-level='31' />
+    </e>
+    <e name='service' api-level='10'>
         <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='process' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='exported' api-level='35' />
-        <a name='stopWithTask' format='boolean' api-level='35' />
-        <a name='isolatedProcess' format='boolean' api-level='35' />
-        <a name='singleUser' api-level='35' />
-        <a name='directBootAware' api-level='35' />
-        <a name='externalService' format='boolean' api-level='35' />
-        <a name='visibleToInstantApps' api-level='35' />
-        <a name='splitName' api-level='35' />
-        <a name='useAppZygote' format='boolean' api-level='35' />
-        <a name='foregroundServiceType' api-level='35' />
-        <a name='attributionTags' api-level='35' />
-        <a name='allowSharedIsolatedProcess' format='boolean' api-level='35' />
+        <a name='name' />
+        <a name='label' />
+        <a name='description' />
+        <a name='icon' />
+        <a name='permission' />
+        <a name='process' />
+        <a name='enabled' />
+        <a name='exported' />
+        <a name='logo' api-level='15' />
+        <a name='stopWithTask' format='boolean' api-level='15' />
+        <a name='isolatedProcess' format='boolean' api-level='16' />
+        <a name='singleUser' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='directBootAware' api-level='24' />
+        <a name='externalService' format='boolean' api-level='24' />
+        <a name='roundIcon' api-level='25' />
+        <a name='visibleToInstantApps' api-level='26' />
+        <a name='splitName' api-level='26' />
+        <a name='useAppZygote' format='boolean' api-level='29' />
+        <a name='foregroundServiceType' api-level='29' />
+        <a name='attributionTags' api-level='31' />
+        <a name='allowSharedIsolatedProcess' format='boolean' api-level='34' />
         <a name='systemUserOnly' format='boolean' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='privateComputeCore' api-level='37.0' />
         <a name='nativeService' format='boolean' api-level='37.0' />
     </e>
-    <e name='apex-system-service' api-level='35'>
+    <e name='receiver' api-level='10'>
         <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='path' api-level='35' />
-        <a name='minSdkVersion' api-level='35' />
-        <a name='maxSdkVersion' api-level='35' />
-        <a name='initOrder' format='integer' api-level='35' />
-    </e>
-    <e name='receiver' api-level='35'>
-        <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='process' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='exported' api-level='35' />
-        <a name='singleUser' api-level='35' />
-        <a name='directBootAware' api-level='35' />
-        <a name='attributionTags' api-level='35' />
+        <a name='name' />
+        <a name='label' />
+        <a name='description' />
+        <a name='icon' />
+        <a name='permission' />
+        <a name='process' />
+        <a name='enabled' />
+        <a name='exported' />
+        <a name='logo' api-level='15' />
+        <a name='singleUser' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='directBootAware' api-level='24' />
+        <a name='roundIcon' api-level='25' />
+        <a name='attributionTags' api-level='31' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='activity' api-level='35'>
+    <e name='activity' api-level='10'>
         <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='theme' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='launchMode' api-level='35' />
-        <a name='screenOrientation' api-level='35' />
-        <a name='configChanges' api-level='35' />
-        <a name='recreateOnConfigChanges' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='multiprocess' api-level='35' />
-        <a name='process' api-level='35' />
-        <a name='taskAffinity' api-level='35' />
-        <a name='allowTaskReparenting' api-level='35' />
-        <a name='finishOnTaskLaunch' api-level='35' />
-        <a name='finishOnCloseSystemDialogs' api-level='35' />
-        <a name='clearTaskOnLaunch' api-level='35' />
-        <a name='noHistory' api-level='35' />
-        <a name='alwaysRetainTaskState' api-level='35' />
-        <a name='stateNotNeeded' api-level='35' />
-        <a name='excludeFromRecents' api-level='35' />
-        <a name='showOnLockScreen' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='exported' api-level='35' />
-        <a name='windowSoftInputMode' api-level='35' />
-        <a name='immersive' api-level='35' />
-        <a name='hardwareAccelerated' api-level='35' />
-        <a name='uiOptions' api-level='35' />
-        <a name='parentActivityName' api-level='35' />
-        <a name='singleUser' api-level='35' />
-        <a name='systemUserOnly' format='boolean' api-level='35' />
-        <a name='persistableMode' api-level='35' />
-        <a name='allowEmbedded' api-level='35' />
-        <a name='documentLaunchMode' api-level='35' />
-        <a name='maxRecents' api-level='35' />
-        <a name='autoRemoveFromRecents' api-level='35' />
-        <a name='relinquishTaskIdentity' api-level='35' />
-        <a name='resumeWhilePausing' api-level='35' />
-        <a name='resizeableActivity' api-level='35' />
-        <a name='supportsPictureInPicture' api-level='35' />
-        <a name='maxAspectRatio' api-level='35' />
-        <a name='minAspectRatio' api-level='35' />
-        <a name='lockTaskMode' api-level='35' />
-        <a name='showForAllUsers' api-level='35' />
-        <a name='showWhenLocked' api-level='35' />
-        <a name='inheritShowWhenLocked' api-level='35' />
-        <a name='turnScreenOn' api-level='35' />
-        <a name='directBootAware' api-level='35' />
-        <a name='alwaysFocusable' format='boolean' api-level='35' />
-        <a name='enableVrMode' api-level='35' />
-        <a name='rotationAnimation' api-level='35' />
-        <a name='visibleToInstantApps' api-level='35' />
-        <a name='splitName' api-level='35' />
-        <a name='colorMode' api-level='35' />
-        <a name='forceQueryable' format='boolean' api-level='35' />
-        <a name='preferMinimalPostProcessing' format='boolean' api-level='35' />
-        <a name='attributionTags' api-level='35' />
-        <a name='playHomeTransitionSound' format='boolean' api-level='35' />
-        <a name='canDisplayOnRemoteDevices' format='boolean' api-level='35' />
-        <a name='allowUntrustedActivityEmbedding' api-level='35' />
-        <a name='knownActivityEmbeddingCerts' api-level='35' />
-        <a name='requiredDisplayCategory' format='string' api-level='35' />
-        <a name='enableOnBackInvokedCallback' format='boolean' api-level='35' />
+        <a name='name' />
+        <a name='theme' />
+        <a name='label' />
+        <a name='description' />
+        <a name='icon' />
+        <a name='launchMode' />
+        <a name='screenOrientation' />
+        <a name='configChanges' />
+        <a name='permission' />
+        <a name='multiprocess' />
+        <a name='process' />
+        <a name='taskAffinity' />
+        <a name='allowTaskReparenting' />
+        <a name='finishOnTaskLaunch' />
+        <a name='finishOnCloseSystemDialogs' />
+        <a name='clearTaskOnLaunch' />
+        <a name='noHistory' />
+        <a name='alwaysRetainTaskState' />
+        <a name='stateNotNeeded' />
+        <a name='excludeFromRecents' />
+        <a name='enabled' />
+        <a name='exported' />
+        <a name='windowSoftInputMode' />
+        <a name='logo' api-level='15' />
+        <a name='immersive' api-level='15' />
+        <a name='hardwareAccelerated' api-level='15' />
+        <a name='uiOptions' api-level='15' />
+        <a name='parentActivityName' api-level='16' />
+        <a name='showOnLockScreen' api-level='17' />
+        <a name='singleUser' api-level='17' />
+        <a name='primaryUserOnly' format='boolean' api-level='17' />
+        <a name='banner' api-level='20' />
+        <a name='allowEmbedded' api-level='20' />
+        <a name='persistableMode' api-level='21' />
+        <a name='documentLaunchMode' api-level='21' />
+        <a name='maxRecents' api-level='21' />
+        <a name='autoRemoveFromRecents' api-level='21' />
+        <a name='relinquishTaskIdentity' api-level='21' />
+        <a name='resumeWhilePausing' api-level='21' />
+        <a name='resizeableActivity' api-level='23' />
+        <a name='lockTaskMode' api-level='23' />
+        <a name='showForAllUsers' api-level='23' />
+        <a name='systemUserOnly' format='boolean' api-level='24' />
+        <a name='supportsPictureInPicture' api-level='24' />
+        <a name='directBootAware' api-level='24' />
+        <a name='alwaysFocusable' format='boolean' api-level='24' />
+        <a name='enableVrMode' api-level='24' />
+        <a name='roundIcon' api-level='25' />
+        <a name='recreateOnConfigChanges' api-level='26' />
+        <a name='maxAspectRatio' api-level='26' />
+        <a name='rotationAnimation' api-level='26' />
+        <a name='visibleToInstantApps' api-level='26' />
+        <a name='splitName' api-level='26' />
+        <a name='colorMode' api-level='26' />
+        <a name='showWhenLocked' api-level='27' />
+        <a name='turnScreenOn' api-level='27' />
+        <a name='minAspectRatio' api-level='29' />
+        <a name='inheritShowWhenLocked' api-level='29' />
+        <a name='forceQueryable' format='boolean' api-level='30' />
+        <a name='preferMinimalPostProcessing' format='boolean' api-level='30' />
+        <a name='attributionTags' api-level='31' />
+        <a name='playHomeTransitionSound' format='boolean' api-level='31' />
+        <a name='canDisplayOnRemoteDevices' format='boolean' api-level='33' />
+        <a name='allowUntrustedActivityEmbedding' api-level='33' />
+        <a name='knownActivityEmbeddingCerts' api-level='33' />
+        <a name='requiredDisplayCategory' format='string' api-level='34' />
+        <a name='enableOnBackInvokedCallback' format='boolean' api-level='34' />
         <a name='requireContentUriPermissionFromCaller' format='string' api-level='35' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='activity-alias' api-level='35'>
+    <e name='activity-alias' api-level='10'>
         <parent>application</parent>
-        <a name='name' api-level='35' />
-        <a name='targetActivity' format='string' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='description' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='permission' api-level='35' />
-        <a name='enabled' api-level='35' />
-        <a name='exported' api-level='35' />
-        <a name='parentActivityName' api-level='35' />
-        <a name='attributionTags' api-level='35' />
-        <a name='allowUntrustedActivityEmbedding' api-level='35' />
-        <a name='knownActivityEmbeddingCerts' api-level='35' />
+        <a name='name' />
+        <a name='targetActivity' format='string' />
+        <a name='label' />
+        <a name='description' />
+        <a name='icon' />
+        <a name='permission' />
+        <a name='enabled' />
+        <a name='exported' />
+        <a name='logo' api-level='15' />
+        <a name='parentActivityName' api-level='16' />
+        <a name='banner' api-level='20' />
+        <a name='roundIcon' api-level='25' />
+        <a name='attributionTags' api-level='31' />
+        <a name='allowUntrustedActivityEmbedding' api-level='33' />
+        <a name='knownActivityEmbeddingCerts' api-level='33' />
         <a name='intentMatchingFlags' api-level='36.1' />
         <a name='privateComputeCore' api-level='37.0' />
     </e>
-    <e name='meta-data' api-level='35'>
+    <e name='meta-data' api-level='10'>
         <parent>application</parent>
         <parent>activity</parent>
         <parent>receiver</parent>
@@ -513,59 +406,44 @@
         <parent>permission</parent>
         <parent>permission-group</parent>
         <parent>instrumentation</parent>
-        <a name='name' api-level='35' />
-        <a name='value' format='string|integer|color|float|boolean' api-level='35' />
-        <a name='resource' format='reference' api-level='35' />
-    </e>
-    <e name='property' api-level='35'>
-        <parent>application</parent>
-        <parent>activity</parent>
-        <parent>receiver</parent>
-        <parent>provider</parent>
-        <parent>service</parent>
-        <a name='name' api-level='35' />
-        <a name='value' api-level='35' />
-        <a name='resource' api-level='35' />
+        <a name='name' />
+        <a name='value' format='string|integer|color|float|boolean' />
+        <a name='resource' format='reference' />
     </e>
-    <e name='intent-filter' api-level='35'>
+    <e name='intent-filter' api-level='10'>
         <parent>activity</parent>
         <parent>receiver</parent>
         <parent>service</parent>
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='priority' api-level='35' />
-        <a name='autoVerify' api-level='35' />
-        <a name='order' api-level='35' />
-    </e>
-    <e name='action' api-level='35'>
+        <a name='label' />
+        <a name='icon' />
+        <a name='priority' />
+        <a name='logo' api-level='15' />
+        <a name='banner' api-level='20' />
+        <a name='autoVerify' api-level='23' />
+        <a name='roundIcon' api-level='25' />
+        <a name='order' api-level='28' />
+    </e>
+    <e name='action' api-level='10'>
         <parent>intent-filter</parent>
-        <a name='name' api-level='35' />
+        <a name='name' />
     </e>
-    <e name='uri-relative-filter-group' api-level='35'>
+    <e name='data' api-level='10'>
         <parent>intent-filter</parent>
-        <a name='allow' format='boolean' api-level='35' />
-    </e>
-    <e name='data' api-level='35'>
-        <parent>intent-filter</parent>
-        <parent>uri-relative-filter-group</parent>
-        <a name='mimeType' format='string' api-level='35' />
-        <a name='mimeGroup' format='string' api-level='35' />
-        <a name='scheme' format='string' api-level='35' />
-        <a name='ssp' format='string' api-level='35' />
-        <a name='sspPrefix' format='string' api-level='35' />
-        <a name='sspPattern' format='string' api-level='35' />
-        <a name='sspAdvancedPattern' format='string' api-level='35' />
-        <a name='sspSuffix' format='string' api-level='35' />
-        <a name='host' format='string' api-level='35' />
-        <a name='port' format='string' api-level='35' />
-        <a name='path' api-level='35' />
-        <a name='pathPrefix' api-level='35' />
-        <a name='pathPattern' api-level='35' />
-        <a name='pathAdvancedPattern' api-level='35' />
-        <a name='pathSuffix' api-level='35' />
+        <a name='mimeType' format='string' />
+        <a name='scheme' format='string' />
+        <a name='host' format='string' />
+        <a name='port' format='string' />
+        <a name='path' />
+        <a name='pathPrefix' />
+        <a name='pathPattern' />
+        <a name='ssp' format='string' api-level='19' />
+        <a name='sspPrefix' format='string' api-level='19' />
+        <a name='sspPattern' format='string' api-level='19' />
+        <a name='pathAdvancedPattern' api-level='26' />
+        <a name='mimeGroup' format='string' api-level='30' />
+        <a name='sspAdvancedPattern' format='string' api-level='31' />
+        <a name='sspSuffix' format='string' api-level='31' />
+        <a name='pathSuffix' api-level='31' />
         <a name='query' format='string' api-level='35' />
         <a name='queryPrefix' format='string' api-level='35' />
         <a name='queryPattern' format='string' api-level='35' />
@@ -577,104 +455,231 @@
         <a name='fragmentAdvancedPattern' format='string' api-level='35' />
         <a name='fragmentSuffix' format='string' api-level='35' />
     </e>
-    <e name='category' api-level='35'>
+    <e name='category' api-level='10'>
         <parent>intent-filter</parent>
-        <a name='name' api-level='35' />
+        <a name='name' />
     </e>
-    <e name='instrumentation' api-level='35'>
+    <e name='instrumentation' api-level='10'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='targetPackage' api-level='35' />
-        <a name='targetProcesses' api-level='35' />
-        <a name='label' api-level='35' />
-        <a name='icon' api-level='35' />
-        <a name='roundIcon' api-level='35' />
-        <a name='banner' api-level='35' />
-        <a name='logo' api-level='35' />
-        <a name='handleProfiling' api-level='35' />
-        <a name='functionalTest' api-level='35' />
-    </e>
-    <e name='compatible-screens-screen' api-level='35'>
+        <a name='name' />
+        <a name='targetPackage' />
+        <a name='label' />
+        <a name='icon' />
+        <a name='handleProfiling' />
+        <a name='functionalTest' />
+        <a name='logo' api-level='15' />
+        <a name='banner' api-level='20' />
+        <a name='roundIcon' api-level='25' />
+        <a name='targetProcesses' api-level='26' />
+    </e>
+    <e name='compatible-screens-screen' api-level='10'>
         <parent>compatible-screens</parent>
-        <a name='screenSize' api-level='35' />
-        <a name='screenDensity' format='integer' api-level='35' />
+        <a name='screenSize' />
+        <a name='screenDensity' format='integer' />
+    </e>
+    <e name='intent' api-level='10'>
+        <a name='action' format='string' />
+        <a name='data' format='string' />
+        <a name='mimeType' />
+        <a name='targetPackage' />
+        <a name='targetClass' format='string' />
+        <a name='identifier' format='string' api-level='29' />
+    </e>
+    <e name='intent-category' api-level='10'>
+        <parent>intent</parent>
+        <a name='name' />
     </e>
-    <e name='supports-input-input-type' api-level='35'>
-        <parent>supports-input</parent>
-        <a name='name' api-level='35' />
+    <e name='extra' api-level='10'>
+        <parent>intent</parent>
+        <a name='name' />
+        <a name='value' />
     </e>
-    <e name='package-verifier' api-level='35'>
+    <e name='package-verifier' api-level='15'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
-        <a name='publicKey' api-level='35' />
+        <a name='name' api-level='15' />
+        <a name='publicKey' api-level='15' />
     </e>
-    <e name='resource-overlay' api-level='35'>
+    <e name='library' api-level='18'>
         <parent>manifest</parent>
-        <a name='targetPackage' api-level='35' />
-        <a name='category' format='string' api-level='35' />
-        <a name='priority' api-level='35' />
-        <a name='isStatic' format='boolean' api-level='35' />
-        <a name='requiredSystemPropertyName' format='string' api-level='35' />
-        <a name='requiredSystemPropertyValue' format='string' api-level='35' />
-        <a name='targetName' api-level='35' />
-        <a name='resourcesMap' format='reference' api-level='35' />
-    </e>
-    <e name='intent' api-level='35'>
-        <a name='action' format='string' api-level='35' />
-        <a name='data' format='string' api-level='35' />
-        <a name='mimeType' api-level='35' />
-        <a name='identifier' format='string' api-level='35' />
-        <a name='targetPackage' api-level='35' />
-        <a name='targetClass' format='string' api-level='35' />
-    </e>
-    <e name='intent-category' api-level='35'>
-        <parent>intent</parent>
-        <a name='name' api-level='35' />
+        <a name='name' api-level='18' />
     </e>
-    <e name='extra' api-level='35'>
-        <parent>intent</parent>
-        <a name='name' api-level='35' />
-        <a name='value' api-level='35' />
+    <e name='supports-input-input-type' api-level='19'>
+        <parent>supports-input</parent>
+        <a name='name' api-level='19' />
     </e>
-    <e name='public-key' api-level='35'>
-        <a name='name' api-level='35' />
-        <a name='value' api-level='35' />
+    <e name='public-key' api-level='19'>
+        <a name='value' api-level='19' />
+        <a name='name' api-level='21' />
     </e>
-    <e name='key-set' api-level='35'>
-        <a name='name' api-level='35' />
+    <e name='key-set' api-level='19'>
+        <a name='name' api-level='19' />
     </e>
-    <e name='upgrade-key-set' api-level='35'>
+    <e name='feature-group' api-level='21'>
+        <a name='label' api-level='21' />
+    </e>
+    <e name='resource-overlay' api-level='21'>
+        <parent>manifest</parent>
+        <a name='targetPackage' api-level='21' />
+        <a name='priority' api-level='21' />
+        <a name='isStatic' format='boolean' api-level='26' />
+        <a name='requiredSystemPropertyName' format='string' api-level='26' />
+        <a name='requiredSystemPropertyValue' format='string' api-level='26' />
+        <a name='category' format='string' api-level='28' />
+        <a name='targetName' api-level='29' />
+        <a name='resourcesMap' format='reference' api-level='30' />
+    </e>
+    <e name='upgrade-key-set' api-level='21'>
         <parent>manifest</parent>
-        <a name='name' api-level='35' />
+        <a name='name' api-level='21' />
     </e>
-    <e name='layout' api-level='35'>
+    <e name='layout' api-level='24'>
         <parent>activity</parent>
-        <a name='defaultWidth' format='dimension|fraction' api-level='35' />
-        <a name='defaultHeight' format='dimension|fraction' api-level='35' />
-        <a name='gravity' api-level='35' />
-        <a name='minWidth' api-level='35' />
-        <a name='minHeight' api-level='35' />
-        <a name='windowLayoutAffinity' format='string' api-level='35' />
-    </e>
-    <e name='restrict-update' api-level='35'>
+        <a name='defaultWidth' format='dimension|fraction' api-level='24' />
+        <a name='defaultHeight' format='dimension|fraction' api-level='24' />
+        <a name='gravity' api-level='24' />
+        <a name='minWidth' api-level='24' />
+        <a name='minimalWidth' format='dimension' api-level='24' />
+        <a name='minHeight' api-level='24' />
+        <a name='minimalHeight' format='dimension' api-level='24' />
+        <a name='windowLayoutAffinity' format='string' api-level='31' />
+    </e>
+    <e name='restrict-update' api-level='24'>
         <parent>manifest</parent>
-        <a name='hash' format='string' api-level='35' />
+        <a name='hash' format='string' api-level='24' />
+    </e>
+    <e name='static-library' api-level='26'>
+        <parent>application</parent>
+        <a name='name' api-level='26' />
+        <a name='version' api-level='26' />
+        <a name='versionMajor' format='integer' api-level='28' />
     </e>
-    <e name='uses-split' api-level='35'>
+    <e name='uses-static-library' api-level='26'>
+        <parent>application</parent>
+        <a name='name' api-level='26' />
+        <a name='version' api-level='26' />
+        <a name='certDigest' format='string' api-level='26' />
+    </e>
+    <e name='uses-split' api-level='26'>
         <parent>manifest</parent>
-        <a name='name' format='string' api-level='35' />
+        <a name='name' format='string' api-level='26' />
+    </e>
+    <e name='additional-certificate' api-level='27'>
+        <parent>uses-static-library</parent>
+        <a name='certDigest' api-level='27' />
+    </e>
+    <e name='uses-package' api-level='29'>
+        <parent>application</parent>
+        <a name='packageType' format='string' api-level='29' />
+        <a name='name' api-level='29' />
+        <a name='version' api-level='29' />
+        <a name='versionMajor' format='integer' api-level='29' />
+        <a name='certDigest' format='string' api-level='29' />
+    </e>
+    <e name='profileable' api-level='29'>
+        <parent>application</parent>
+        <a name='shell' format='boolean' api-level='29' />
+        <a name='enabled' format='boolean' api-level='31' />
+    </e>
+    <e name='attribution' api-level='30'>
+        <parent>manifest</parent>
+        <a name='featureId' format='string' api-level='30' />
+        <a name='tag' format='string' api-level='30' />
+        <a name='label' format='string' api-level='30' />
+    </e>
+    <e name='attribution-inherit-from' api-level='30'>
+        <parent>attribution</parent>
+        <a name='tag' format='string' api-level='30' />
+    </e>
+    <e name='extension-sdk' api-level='30'>
+        <a name='sdkVersion' format='integer' api-level='30' />
+        <a name='minExtensionVersion' format='integer' api-level='30' />
+    </e>
+    <e name='queries' api-level='30'>
+        <parent>manifest</parent>
+    </e>
+    <e name='queries-package' api-level='30'>
+        <parent>queries</parent>
+        <a name='name' api-level='30' />
+    </e>
+    <e name='queries-intent' api-level='30'>
+        <parent>queries</parent>
+    </e>
+    <e name='queries-provider' api-level='30'>
+        <parent>queries</parent>
+        <a name='authorities' api-level='30' />
     </e>
-    <e name='profileable' api-level='35'>
+    <e name='processes' api-level='30'>
         <parent>application</parent>
-        <a name='shell' format='boolean' api-level='35' />
-        <a name='enabled' format='boolean' api-level='35' />
     </e>
-    <e name='install-constraints' api-level='35'>
+    <e name='process' api-level='30'>
+        <parent>processes</parent>
+        <a name='process' api-level='30' />
+        <a name='gwpAsanMode' api-level='30' />
+        <a name='memtagMode' api-level='31' />
+        <a name='nativeHeapZeroInitialized' api-level='31' />
+        <a name='name' api-level='33' />
+        <a name='useEmbeddedDex' api-level='35' />
+        <a name='singleUser' api-level='37.1' />
+    </e>
+    <e name='deny-permission' api-level='30'>
+        <parent>processes</parent>
+        <a name='name' api-level='30' />
+    </e>
+    <e name='allow-permission' api-level='30'>
+        <parent>processes</parent>
+        <a name='name' api-level='30' />
+    </e>
+    <e name='required-feature' api-level='31'>
+        <a name='name' api-level='31' />
+    </e>
+    <e name='required-not-feature' api-level='31'>
+        <a name='name' api-level='31' />
+    </e>
+    <e name='uses-native-library' api-level='31'>
+        <parent>application</parent>
+        <a name='name' api-level='31' />
+        <a name='required' api-level='31' />
+    </e>
+    <e name='property' api-level='31'>
+        <parent>application</parent>
+        <parent>activity</parent>
+        <parent>receiver</parent>
+        <parent>provider</parent>
+        <parent>service</parent>
+        <a name='name' api-level='31' />
+        <a name='value' api-level='31' />
+        <a name='resource' api-level='31' />
+    </e>
+    <e name='sdk-library' api-level='33'>
+        <parent>application</parent>
+        <a name='name' api-level='33' />
+        <a name='versionMajor' format='integer' api-level='33' />
+    </e>
+    <e name='uses-sdk-library' api-level='33'>
+        <parent>application</parent>
+        <a name='name' api-level='33' />
+        <a name='versionMajor' format='integer' api-level='33' />
+        <a name='certDigest' format='string' api-level='33' />
+        <a name='optional' format='boolean' api-level='35' />
+    </e>
+    <e name='apex-system-service' api-level='33'>
+        <parent>application</parent>
+        <a name='name' api-level='33' />
+        <a name='path' api-level='33' />
+        <a name='minSdkVersion' api-level='33' />
+        <a name='maxSdkVersion' api-level='33' />
+        <a name='initOrder' format='integer' api-level='33' />
+    </e>
+    <e name='install-constraints' api-level='34'>
         <parent>manifest</parent>
     </e>
-    <e name='install-constraints-fingerprint-prefix' api-level='35'>
+    <e name='install-constraints-fingerprint-prefix' api-level='34'>
         <parent>install-constraints</parent>
-        <a name='value' api-level='35' />
+        <a name='value' api-level='34' />
+    </e>
+    <e name='uri-relative-filter-group' api-level='35'>
+        <parent>intent-filter</parent>
+        <a name='allow' format='boolean' api-level='35' />
     </e>
     <e name='valid-purpose' api-level='36.1'>
         <parent>permission</parent>
diff --git a/build-tools/manifest-attribute-codegen/metadata.xml b/build-tools/manifest-attribute-codegen/metadata.xml
index ba9ed3d3a8d..0a3331dc47c 100644
--- a/build-tools/manifest-attribute-codegen/metadata.xml
+++ b/build-tools/manifest-attribute-codegen/metadata.xml
@@ -149,6 +149,7 @@
   <element path="activity.minAspectRatio" visible="false" />
   <element path="activity.playHomeTransitionSound" visible="false" />
   <element path="activity.preferMinimalPostProcessing" visible="false" />
+  <element path="activity.primaryUserOnly" visible="false" />
   <element path="activity.privateComputeCore" visible="false" />
   <element path="activity.requiredDisplayCategory" visible="false" />
   <element path="activity.splitName" visible="false" />
@@ -226,6 +227,7 @@
   <element path="application.minAspectRatio" visible="false" />
   <element path="application.multiArch" visible="false" />
   <element path="application.nativeHeapZeroInitialized" visible="false" />
+  <element path="application.neverEncrypt" visible="false" />
   <element path="application.persistentWhenFeatureAvailable" visible="false" />
   <element path="application.preserveLegacyExternalStorage" visible="false" />
   <element path="application.requestForegroundServiceExemption" visible="false" />
@@ -287,6 +289,8 @@
   <element path="layout.minWidth" visible="true" />
 
   <!-- Undocumented attributes -->
+  <element path="layout.minimalHeight" visible="false" />
+  <element path="layout.minimalWidth" visible="false" />
   <element path="layout.windowLayoutAffinity" visible="false" />
 
   <!-- <meta-data> - https://developer.android.com/guide/topics/manifest/meta-data-element -->

From eff5ae3ef78b00003b7d681b85105ea6d06aa2ac Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 20 Aug 2026 12:33:44 -0500
Subject: [PATCH 3/3] [docs] Avoid duplicate method map export

Clarify that the normalized BindingStudio output is the final method map so contributors do not append the raw JNI-formatted rows a second time.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
---
 Documentation/workflow/HowToAddNewApiLevel.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Documentation/workflow/HowToAddNewApiLevel.md b/Documentation/workflow/HowToAddNewApiLevel.md
index 1303b1f2b4f..d7c0f3f4f38 100644
--- a/Documentation/workflow/HowToAddNewApiLevel.md
+++ b/Documentation/workflow/HowToAddNewApiLevel.md
@@ -612,15 +612,10 @@ are automatically converted into `Android.Graphics.Color`.
 
 ### Finishing the method map
 
-The official `methodmap.csv` uses a slightly different format than the one used for enumification.
-
-Using BindingStudio:
-
-- Ensure the "new api level method map" CSV file is loaded.
-- Choose `Tools` -> `Export Final Method Map`
-- Choose a temporary file name
-- Open the temporary file, copy the contents to the bottom of the official:
-  - dotnet/android/src/Mono.Android/methodmap.csv
+The normalized `new-methodmap2.csv` output appended in the **Mapping methods** section
+is the final method map. Do not export and append the BindingStudio output again, as
+the raw output uses JNI package and nested-type syntax that `methodmap.csv` does not
+support.
 
 Congrats! Enumification is complete!