Merge branch 'main' into wsu-20240419

Directory.Build.props

@@ -10,7 +10,7 @@
 
     <!-- Use an updated 'generator' -->
     <!-- It's ok to use "Windows" here because we only use managed code from this package -->
-    <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.43/tools/</_BindingsToolsLocation>
+    <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.95/tools/</_BindingsToolsLocation>
     
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>

build.cake

@@ -2,7 +2,7 @@
 #tool nuget:?package=vswhere&version=3.1.7
 
 #tool nuget:?package=Cake.CoreCLR
-#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=34.0.43
+#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=34.0.95
 
 // Cake Addins
 #addin nuget:?package=Cake.FileHelpers&version=7.0.0

source/androidx.browser/browser/Additions/CustomTabsActivityManager.cs

@@ -9,8 +9,10 @@ namespace AndroidX.Browser.CustomTabs
 {
     public class CustomTabsActivityManager
     {
-        static CustomTabsActivityManager instance;
-        public static CustomTabsActivityManager From (Activity parentActivity, string servicePackageName = null)
+        static CustomTabsActivityManager? instance;
+
+        [Obsolete ("This method only supports a single parentActivity and caches a reference to it forever. It is recommended to use the CustomTabsActivityManager constructor instead and implement any desired caching in the consuming application.")]
+        public static CustomTabsActivityManager From (Activity parentActivity, string? servicePackageName = null)
         {
             if (instance == null) {
                 instance = new CustomTabsActivityManager (parentActivity);
@@ -22,8 +24,8 @@ namespace AndroidX.Browser.CustomTabs
         public Activity ParentActivity { get; private set; }
         public CustomTabsClient Client { get; private set; }
 
-        CustomTabsSession session = null;
-        public CustomTabsSession Session { 
+        CustomTabsSession? session = null;
+        public CustomTabsSession? Session { 
             get {
                 if (Client == null) {
                     return null;