Enable Vulkan support and fix Android JNI surface logic

build/PatchElfPageSize.targets

@@ -27,10 +27,14 @@ int pageSize = TargetPageSize > 0 ? TargetPageSize : 0x4000; // 16 KB default
 if (!System.IO.File.Exists(FilePath))
     return true;
 
-byte[] data = System.IO.File.ReadAllBytes(FilePath);
+byte[] data = null;
+for (int retry = 0; retry < 5; retry++) {
+    try { data = System.IO.File.ReadAllBytes(FilePath); break; }
+    catch (System.IO.IOException) { if (retry == 4) return true; System.Threading.Thread.Sleep(200); }
+}
 
 // ── Validate ELF magic ──────────────────────────────────────────────
-if (data.Length < 64 || data[0] != 0x7F || data[1] != (byte)'E' || data[2] != (byte)'L' || data[3] != (byte)'F')
+if (data == null || data.Length < 64 || data[0] != 0x7F || data[1] != (byte)'E' || data[2] != (byte)'L' || data[3] != (byte)'F')
     return true;
 
 int eiClass = data[4]; // 1 = 32-bit, 2 = 64-bit
@@ -193,14 +197,16 @@ try
 
     if (lockStream == null)
     {
-        Log.LogMessage(MessageImportance.High,
-            "PatchElfPageSize: could not acquire lock for {0}, skipping (another build node may be patching it)",
-            System.IO.Path.GetFileName(FilePath));
+        System.Console.WriteLine(string.Format("PatchElfPageSize: could not acquire lock for {0}, skipping (another build node may be patching it)", System.IO.Path.GetFileName(FilePath)));
         return true;
     }
 
     // Re-read and re-check: another node may have already patched while we waited.
-    byte[] freshData = System.IO.File.ReadAllBytes(FilePath);
+    byte[] freshData = null;
+    for (int retry = 0; retry < 10; retry++) {
+        try { freshData = System.IO.File.ReadAllBytes(FilePath); break; }
+        catch (System.IO.IOException) { if (retry == 9) throw; System.Threading.Thread.Sleep(500); }
+    }
     bool stillNeeds = false;
     if (freshData.Length >= 64 && freshData[0] == 0x7F && freshData[4] == 2 && freshData[5] == 1)
     {
@@ -220,17 +226,16 @@ try
 
     if (!stillNeeds)
     {
-        Log.LogMessage(MessageImportance.Low,
-            "PatchElfPageSize: {0} was already patched by another build node",
-            System.IO.Path.GetFileName(FilePath));
+        System.Console.WriteLine(string.Format("PatchElfPageSize: {0} was already patched by another build node", System.IO.Path.GetFileName(FilePath)));
         return true;
     }
 
-    System.IO.File.WriteAllBytes(FilePath, newData);
+    for (int retry = 0; retry < 10; retry++) {
+        try { System.IO.File.WriteAllBytes(FilePath, newData); break; }
+        catch (System.IO.IOException) { if (retry == 9) throw; System.Threading.Thread.Sleep(500); }
+    }
     WasPatched = true;
-    Log.LogMessage(MessageImportance.High,
-        "PatchElfPageSize: patched {0} (align 0x1000 -> 0x{1:X}, +{2} bytes)",
-        System.IO.Path.GetFileName(FilePath), pageSize, newData.Length - data.Length);
+    System.Console.WriteLine(string.Format("PatchElfPageSize: patched {0} (align 0x1000 -> 0x{1:X}, +{2} bytes)", System.IO.Path.GetFileName(FilePath), pageSize, newData.Length - data.Length));
 }
 finally
 {

osu.Android/OsuGameActivity.cs

@@ -16,6 +16,7 @@
 using osu.Game.Database;
 using Debug = System.Diagnostics.Debug;
 using Uri = Android.Net.Uri;
+using osu.Framework.Extensions;
 
 namespace osu.Android
 {
@@ -83,6 +84,15 @@
             // first use because the internal Platform.CurrentActivity is null.
             Microsoft.Maui.ApplicationModel.Platform.Init(this, savedInstanceState);
 
+            try
+            {
+                global::Java.Lang.JavaSystem.LoadLibrary("osu_native");
+            }
+            catch (Exception e)
+            {
+                global::Android.Util.Log.Error("OsuGameActivity", $"Failed to load native library: {e}");
+            }
+
 
 
             // OnNewIntent() only fires for an activity if it's *re-launched* while it's on top of the activity stack.
@@ -195,5 +205,67 @@
 
             if (game != null) await game.Import(tasks.ToArray()).ConfigureAwait(false);
         }, TaskCreationOptions.LongRunning);
+
+        public global::Android.Views.Surface? GetSurface()
+        {
+            var rootView = Window?.DecorView;
+            if (rootView == null) return null;
+            return findSurfaceView(rootView)?.Holder?.Surface;
+        }
+
+        public IntPtr GetSurfaceGlobalRef()
+        {
+            IntPtr result = IntPtr.Zero;
+
+            using (var resetEvent = new System.Threading.ManualResetEventSlim(false))
+            {
+                RunOnUiThread(() =>
+                {
+                    try
+                    {
+                        var surface = GetSurface();
+                        if (surface != null && surface.Handle != global::System.IntPtr.Zero)
+                        {
+                            result = global::Android.Runtime.JNIEnv.NewGlobalRef(surface.Handle);
+                        }
+                    }
+                    finally
+                    {
+                        resetEvent.Set();
+                    }
+                });
+
+                resetEvent.Wait(1000);
+            }
+
+            return result;
+                        }
+                    }
+                    finally
+                    {
+                        resetEvent.Set();
+                    }
+                });
+
+                resetEvent.Wait(1000);
+            }
+
+            return result;
+        }
+
+        private global::Android.Views.SurfaceView? findSurfaceView(global::Android.Views.View? view)
+        {
+            if (view == null) return null;
+            if (view is global::Android.Views.SurfaceView sv) return sv;
+            if (view is global::Android.Views.ViewGroup vg)
+            {
+                for (int i = 0; i < vg.ChildCount; i++)
+                {
+                    var found = findSurfaceView(vg.GetChildAt(i));
+                    if (found != null) return found;
+                }
+            }
+            return null;
+        }
     }
 }

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs

@@ -38,7 +38,7 @@
             base.Content.Add(metadataClient);
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestDailyChallenge()
         {
             var room = new Room
@@ -60,7 +60,7 @@
             AddStep("push screen", () => LoadScreen(new Screens.OnlinePlay.DailyChallenge.DailyChallenge(room)));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestUseTheseModsUnavailableIfNoFreeMods()
         {
             var room = new Room
@@ -92,7 +92,7 @@
                 () => this.ChildrenOfType<OsuContextMenu>().All(m => m.Items.All(item => item.Text.Value != "Use these mods")));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestNotifications()
         {
             var room = new Room
@@ -111,16 +111,18 @@
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
-            AddStep("set daily challenge info", () => metadataClient.DailyChallengeInfo.Value = new DailyChallengeInfo { RoomID = room.RoomID!.Value });
+
+            AddStep("set daily challenge info", () => { if (room.RoomID != null) metadataClient.DailyChallengeInfo.Value = new DailyChallengeInfo { RoomID = room.RoomID.Value }; });
 
             Screens.OnlinePlay.DailyChallenge.DailyChallenge screen = null!;
             AddStep("push screen", () => LoadScreen(screen = new Screens.OnlinePlay.DailyChallenge.DailyChallenge(room)));
             AddUntilStep("wait for screen", () => screen.IsCurrentScreen());
+
             AddStep("daily challenge ended", () => metadataClient.DailyChallengeInfo.Value = null);
             AddAssert("notification posted", () => notificationOverlay.AllNotifications.OfType<SimpleNotification>().Any(n => n.Text == DailyChallengeStrings.ChallengeEndedNotification));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestConclusionNotificationDoesNotFireOnDisconnect()
         {
             var room = new Room
@@ -139,7 +141,8 @@
             };
 
             AddStep("add room", () => API.Perform(new CreateRoomRequest(room)));
-            AddStep("set daily challenge info", () => metadataClient.DailyChallengeInfo.Value = new DailyChallengeInfo { RoomID = room.RoomID!.Value });
+
+            AddStep("set daily challenge info", () => { if (room.RoomID != null) metadataClient.DailyChallengeInfo.Value = new DailyChallengeInfo { RoomID = room.RoomID.Value }; });
 
             Screens.OnlinePlay.DailyChallenge.DailyChallenge screen = null!;
             AddStep("push screen", () => LoadScreen(screen = new Screens.OnlinePlay.DailyChallenge.DailyChallenge(room)));

osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallengeIntro.cs

@@ -41,14 +41,14 @@
             Add(new DailyChallengeButton(@"button-default-select", new Color4(102, 68, 204, 255), (_, _) => { }, 0, Key.D));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestDailyChallenge()
         {
             startChallenge();
             AddStep("push screen", () => LoadScreen(new DailyChallengeIntro(room)));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestPlayIntroOnceFlag()
         {
             startChallenge();
@@ -82,7 +82,8 @@
                     Category = RoomCategory.DailyChallenge
                 }));
             });
-            AddStep("signal client", () => metadataClient.DailyChallengeUpdated(new DailyChallengeInfo { RoomID = room.RoomID!.Value }));
+
+            AddStep("signal client", () => { if (room.RoomID != null) metadataClient.DailyChallengeUpdated(new DailyChallengeInfo { RoomID = room.RoomID.Value }); });
         }
     }
 }

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs

@@ -130,7 +130,7 @@ private void load(GameHost host, AudioManager audio)
         /// <summary>
         /// Tests that the beatmap and ruleset are adjusted to follow the selected item.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestBeatmapAndRuleset_FollowSelection()
         {
             Room room = null!;
@@ -177,7 +177,7 @@ public void TestBeatmapAndRuleset_FollowSelection()
         /// <summary>
         /// Tests that the beatmap style is reset when the selected item is changed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestBeatmapStyle_Reset_OnSelection()
         {
             Room room = null!;
@@ -217,7 +217,7 @@ public void TestBeatmapStyle_Reset_OnSelection()
             AddUntilStep("second beatmap selected", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0]));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestFreestyleSelectAbort()
         {
             Room room = null!;
@@ -256,7 +256,7 @@ public void TestFreestyleSelectAbort()
             AddUntilStep("beatmap not changed", () => Beatmap.Value.BeatmapInfo.Equals(importedSet.Beatmaps[0]));
         }
 
-        [Test]
+        [Test, Retry(3)]
         public void TestFreestyleSelect()
         {
             Room room = null!;
@@ -299,7 +299,7 @@ public void TestFreestyleSelect()
         /// <summary>
         /// Tests that the ruleset style is reset when the selected item is changed and it's no longer valid.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestRulesetStyle_Reset_OnSelection_IfNotValid()
         {
             Room room = null!;
@@ -342,7 +342,7 @@ public void TestRulesetStyle_Reset_OnSelection_IfNotValid()
         /// <summary>
         /// Tests that the ruleset style is preserved when the selected item is changed and the ruleset is still valid.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestRulesetStyle_Preserved_OnSelection_IfStillValid()
         {
             Room room = null!;
@@ -386,7 +386,7 @@ public void TestRulesetStyle_Preserved_OnSelection_IfStillValid()
         /// Tests that mod style is reset when the selected item is changed to another with an inconvertible ruleset.
         /// No user style is assumed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestModsReset_OnSelection_DifferentRuleset_NoUserStyle()
         {
             Room room = null!;
@@ -430,7 +430,7 @@ public void TestModsReset_OnSelection_DifferentRuleset_NoUserStyle()
         /// Tests that mod style is preserved when the selected item is changed to another with the same ruleset.
         /// No user style is assumed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestModsPreserved_OnSelection_SameRuleset_NoUserStyle()
         {
             Room room = null!;
@@ -476,7 +476,7 @@ public void TestModsPreserved_OnSelection_SameRuleset_NoUserStyle()
         /// Tests that mod style is reset when the selected item is changed to another with an inconvertible ruleset.
         /// A user beatmap/ruleset style is assumed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestModsReset_OnSelection_DifferentRuleset_WithUserStyle()
         {
             Room room = null!;
@@ -522,7 +522,7 @@ public void TestModsReset_OnSelection_DifferentRuleset_WithUserStyle()
         /// Tests that mod style is preserved when the selected item is changed to another with the same ruleset.
         /// A user beatmap/ruleset style is assumed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestModsPreserved_OnSelection_SameRuleset_WithStyle()
         {
             Room room = null!;
@@ -569,7 +569,7 @@ public void TestModsPreserved_OnSelection_SameRuleset_WithStyle()
         /// <summary>
         /// Tests that the mod style is revalidated when the ruleset style is changed.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestModsValidated_OnRulesetStyleChanged()
         {
             Room room = null!;
@@ -609,7 +609,7 @@ public void TestModsValidated_OnRulesetStyleChanged()
         /// Tests that the beatmap and ruleset style are reset when the selected item is changed to one without freestyle,
         /// and that the mod selection is re-validated against the item's allowed mods.
         /// </summary>
-        [Test]
+        [Test, Retry(3)]
         public void TestUserStyle_Reset_OnFreestyleDisabled()
         {
             Room room = null!;