Fix Android 16 startup crashes and dependency injection error

Author: google-labs-jules[bot]

osu.Android/OsuGameActivity.cs

@@ -61,29 +61,30 @@ protected override Framework.Game CreateGame()
                 throw new InvalidOperationException("Framework tried to create a game twice.");
 
             if (game == null)
-                throw new InvalidOperationException("Game was not initialised in OnCreate.");
+                throw new InvalidOperationException("Game was not initialised.");
 
             gameCreated = true;
             return game;
         }
 
         public OsuGameActivity()
         {
+            game = new OsuGameAndroid(this);
         }
 
         protected override void OnCreate(Bundle? savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
 
-            game = new OsuGameAndroid(this);
-
             // Initialise MAUI Essentials so that Battery, Connectivity and other platform
             // APIs can resolve the current Activity/context. Without this call the
             // BroadcastReceivers registered in the merged manifest (BatteryBroadcastReceiver,
             // EnergySaverBroadcastReceiver, ConnectivityBroadcastReceiver) will crash on
             // first use because the internal Platform.CurrentActivity is null.
             Microsoft.Maui.ApplicationModel.Platform.Init(this, savedInstanceState);
 
+
+
             // OnNewIntent() only fires for an activity if it's *re-launched* while it's on top of the activity stack.
             // on first launch we still have to fire manually.
             // reference: https://developer.android.com/reference/android/app/Activity#onNewIntent(android.content.Intent)

osu.Android/OsuGameAndroid.cs

@@ -27,28 +27,34 @@ public partial class OsuGameAndroid : OsuGame
         [Cached]
         private readonly OsuGameActivity gameActivity;
 
+        private readonly object packageInfoLock = new object();
         private PackageInfo? packageInfo;
         private bool packageInfoChecked;
 
         private PackageInfo? getPackageInfo()
         {
-            if (packageInfoChecked)
-                return packageInfo;
-
-            try
-            {
-                packageInfo = gameActivity.PackageManager?.GetPackageInfo(gameActivity.PackageName!, 0);
-            }
-            catch (Exception e)
+            lock (packageInfoLock)
             {
-                Debug.WriteLine($"[osu!] Failed to retrieve package info: {e.Message}");
-            }
-            finally
-            {
-                packageInfoChecked = true;
-            }
+                if (packageInfoChecked)
+                    return packageInfo;
 
-            return packageInfo;
+                try
+                {
+                    // Use the activity instance directly instead of Application.Context to ensure
+                    // the PackageManager is accessible even on newer/stricter Android versions.
+                    packageInfo = gameActivity.PackageManager?.GetPackageInfo(gameActivity.PackageName!, 0);
+                }
+                catch (Exception e)
+                {
+                    Debug.WriteLine($"[osu!] Failed to retrieve package info: {e.Message}");
+                }
+                finally
+                {
+                    packageInfoChecked = true;
+                }
+
+                return packageInfo;
+            }
         }
 
         public override Vector2 ScalingContainerTargetDrawSize => DrawWidth > 0 && DrawHeight > 0
@@ -109,12 +115,12 @@ public override Version AssemblyVersion
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config)
+        private void load()
         {
-            config.BindWith(OsuSetting.AndroidPerformanceMode, performanceMode);
-            config.BindWith(OsuSetting.AndroidLowLatencyAudio, lowLatencyAudio);
-            config.BindWith(OsuSetting.AndroidVulkanProbe, vulkanProbeEnabled);
-            config.BindWith(OsuSetting.AudioOffset, audioOffset);
+            LocalConfig.BindWith(OsuSetting.AndroidPerformanceMode, performanceMode);
+            LocalConfig.BindWith(OsuSetting.AndroidLowLatencyAudio, lowLatencyAudio);
+            LocalConfig.BindWith(OsuSetting.AndroidVulkanProbe, vulkanProbeEnabled);
+            LocalConfig.BindWith(OsuSetting.AudioOffset, audioOffset);
         }
 
         protected override void LoadComplete()