From 6352fe088046bbb76b5245a4b9d5cad0e29f02ae Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Fri, 21 Apr 2023 12:19:04 -0500
Subject: [PATCH] [Mono.Android] Bind API-UpsideDownCake Beta 1 (#7980)

Context: https://developer.android.com/about/versions/14
Context: https://android-developers.googleblog.com/2023/04/android-14-beta-1.html
Context: e9f3143037f9f8a2852981d48060b6d7012cd475

Android 14 [Beta 1][0] was released on 2023-Apr-12:

  * [API-UpsideDownCake Developer Preview 1 vs. API-33][1] (e9f31430)
  * [API-UpsideDownCake Developer Preview 2 vs. Developer Preview 1][2]
  * [API-UpsideDownCake Beta 1 vs. API-33][3]
  * [API-UpsideDownCake Beta 1 vs. Developer Preview 2][4]

The Android 14 Preview [Timeline, milestones, and updates][5] section
provides the following timeline, unchanged from e9f31430:

  * April: Beta 1
  * May: Beta 2
  * June: Beta 3 with "First [Platform Stability][6] milestone
    including final APIs and behaviors.  Play publishing also opens."
  * July: Beta 4+
  * ???: Final release

[0]: https://developer.android.com/about/versions/14/overview
[1]: https://developer.android.com/sdk/api_diff/u-dp1/changes
[2]: https://developer.android.com/sdk/api_diff/u-dp2-incr/changes
[3]: https://developer.android.com/sdk/api_diff/u-beta1/changes
[4]: https://developer.android.com/sdk/api_diff/u-beta1-incr/changes
[5]: http://web.archive.org/web/20230419085004/https://developer.android.com/about/versions/14/overview#timeline
[6]: http://web.archive.org/web/20230419085004/https://developer.android.com/about/versions/14/overview#platform_stability
---
 .../ConfigAndData/Dependencies/AndroidToolchain.cs       | 2 +-
 src/Mono.Android/metadata                                | 9 ++++++---
 src/Mono.Android/methodmap.csv                           | 2 --
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
index a7863edb155..3fbd2f5f260 100644
--- a/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
+++ b/build-tools/xaprepare/xaprepare/ConfigAndData/Dependencies/AndroidToolchain.cs
@@ -73,7 +73,7 @@ public AndroidToolchain ()
 				new AndroidPlatformComponent ("platform-31_r01",   apiLevel: "31", pkgRevision: "1"),
 				new AndroidPlatformComponent ("platform-32_r01",   apiLevel: "32", pkgRevision: "1"),
 				new AndroidPlatformComponent ("platform-33_r01",   apiLevel: "33", pkgRevision: "1"),
-				new AndroidPlatformComponent ("platform-UpsideDownCake_r01",   apiLevel: "UpsideDownCake", pkgRevision: "1"),
+				new AndroidPlatformComponent ("platform-UpsideDownCake_r03",   apiLevel: "UpsideDownCake", pkgRevision: "3"),
 
 				new AndroidToolchainComponent ("sources-33_r01",
 					destDir: Path.Combine ("sources", "android-33"),
diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata
index 36e5450bea5..09272e2b250 100644
--- a/src/Mono.Android/metadata
+++ b/src/Mono.Android/metadata
@@ -1692,6 +1692,9 @@
   <attr path="/api/package[@name='android.content.pm']/class[@name='PackageManager']/method[@name='resolveActivity' and count(parameter)=2 and parameter[1][@type='android.content.Intent'] and parameter[2][@type='int']]/parameter[@name='flags']" name="enumType">Android.Content.PM.PackageInfoFlags</attr>
   <attr path="/api/package[@name='android.content.pm']/class[@name='PackageManager']/method[@name='resolveContentProvider' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='int']]/parameter[@name='flags']" name="enumType">Android.Content.PM.PackageInfoFlags</attr>
   <attr path="/api/package[@name='android.content.pm']/class[@name='PackageManager']/method[@name='resolveService' and count(parameter)=2 and parameter[1][@type='android.content.Intent'] and parameter[2][@type='int']]/parameter[@name='flags']" name="enumType">Android.Content.PM.PackageInfoFlags</attr>
+  <attr api-since="26" path="/api/package[@name='android.app.admin']/class[@name='DevicePolicyManager']/method[@name='bindDeviceAdminServiceAsUser' and count(parameter)=5 and parameter[1][@type='android.content.ComponentName'] and parameter[2][@type='android.content.Intent'] and parameter[3][@type='android.content.ServiceConnection'] and parameter[4][@type='int'] and parameter[5][@type='android.os.UserHandle']]/parameter[@name='flags']" name="enumType">Android.Content.Bind</attr>
+  <attr path="/api/package[@name='android.content']/class[@name='Context']/method[@name='bindService' and count(parameter)=3 and parameter[1][@type='android.content.Intent'] and parameter[2][@type='android.content.ServiceConnection'] and parameter[3][@type='int']]/parameter[@name='flags']" name="enumType">Android.Content.Bind</attr>
+  <attr api-since="29" path="/api/package[@name='android.content']/class[@name='Context']/method[@name='bindService' and count(parameter)=4 and parameter[1][@type='android.content.Intent'] and parameter[2][@type='int'] and parameter[3][@type='java.util.concurrent.Executor'] and parameter[4][@type='android.content.ServiceConnection']]/parameter[@name='flags']" name="enumType">Android.Content.Bind</attr>
 
   <!-- These parameters that we enumify changed names. Change them back so the enumification process can still find them. -->
   <attr api-since="33" path="/api/package[@name='android.app']/class[@name='Service']/method[@name='stopForeground' and count(parameter)=1 and parameter[1][@type='int']]/parameter[@name='notificationBehavior']" name="name">flags</attr>
@@ -1788,9 +1791,9 @@
   <attr api-since="34" path="/api/package[@name='android.app.appsearch.util']" name="managedName">Android.App.AppSearch.Util</attr>
   <attr api-since="34" path="/api/package[@name='android.app.sdksandbox.sdkprovider']" name="managedName">Android.App.SdkSandbox.SdkProvider</attr>
   <attr api-since="34" path="/api/package[@name='android.devicelock']" name="managedName">Android.DeviceLock</attr>
-  <attr api-since="34" path="/api/package[@name='android.healthconnect']" name="managedName">Android.HealthConnect</attr>
-  <attr api-since="34" path="/api/package[@name='android.healthconnect.datatypes']" name="managedName">Android.HealthConnect.DataTypes</attr>
-  <attr api-since="34" path="/api/package[@name='android.healthconnect.datatypes.units']" name="managedName">Android.HealthConnect.DataTypes.Units</attr>
+  <attr api-since="34" path="/api/package[@name='android.health.connect.changelog']" name="managedName">Android.Health.Connect.ChangeLog</attr>
+  <attr api-since="34" path="/api/package[@name='android.health.connect.datatypes']" name="managedName">Android.Health.Connect.DataTypes</attr>
+  <attr api-since="34" path="/api/package[@name='android.health.connect.datatypes.units']" name="managedName">Android.Health.Connect.DataTypes.Units</attr>
   <attr api-since="34" path="/api/package[@name='android.location.altitude']" name="managedName">Android.Locations.Altitude</attr>
 
   <!--
diff --git a/src/Mono.Android/methodmap.csv b/src/Mono.Android/methodmap.csv
index cd6d2825199..5656f80b0cc 100644
--- a/src/Mono.Android/methodmap.csv
+++ b/src/Mono.Android/methodmap.csv
@@ -78,7 +78,6 @@
 5, android.bluetooth,BluetoothClass,getMajorDeviceClass,return,Android.Bluetooth.MajorDeviceClass
 5, android.bluetooth,BluetoothClass,hasService,service,Android.Bluetooth.ServiceClass
 5, android.bluetooth,BluetoothDevice,getBondState,return,Android.Bluetooth.Bond
-0, android.content,Context,bindService,flags,Android.Content.Bind
 0, android.content,Context,createPackageContext,flags,Android.Content.PackageContextFlags
 0, android.content,Context,getDir,mode,Android.Content.FileCreationMode
 0, android.content,Context,getSharedPreferences,mode,Android.Content.FileCreationMode
@@ -2277,7 +2276,6 @@
 26, android.icu.util, UniversalTimeScale, toLong, timeScale, Android.Icu.Util.UniversalTimeScaleType
 26, android.icu.util, UniversalTimeScale, getTimeScaleValue, value, Android.Icu.Util.UniversalTimeScaleValue
 
-26, android.app.admin, DevicePolicyManager, bindDeviceAdminServiceAsUser, flags, Android.Content.Bind
 26, android.app.admin, DevicePolicyManager, resetPasswordWithToken, flags, Android.App.Admin.ResetPasswordFlags
 26, android.app.admin, DevicePolicyManager, lockNow, flags, Android.App.Admin.DevicePolicyManagerFlags
 26, android.app.assist, AssistStructure.ViewNode, getAutofillType, return, Android.Views.AutofillType