Bump framework to 2026.422.1; root Android Surface managed peer to fix SDLActivity SIGSEGV

[Copilot]

native_crash.log shows the APK looping through two phases: (1) Veldrid.VeldridException: The Swapchain's underlying surface has been lost aborts the Draw thread, then (2) on relaunch SDLActivity dies with SIGSEGV inside libart.so JNI handling. The root cause of (2) is that OsuGameActivity.SurfaceCreated only kept a JNI global ref on surface.Handle — the local Surface wrapper became GC-eligible the moment the method returned, and .NET-for-Android's finaliser then released the underlying Java peer that the global ref still pointed into.

Changes

• Bump ppy.osu.Framework{,.Android,.iOS} 2026.420.2 → 2026.422.1 (osu.Game.csproj, osu.Android.props, osu.iOS.props). Pulls in winnerspiros/osu-framework PR Freeze CatcherTrail animation at generation time #17:

  • Re-snapshot IAndroidGraphicsSurface.SurfaceHandle immediately before vkCreateAndroidSurfaceKHR (managed exception instead of driver SIGSEGV when the surface is destroyed concurrently).
  • Recover from transient surface-lost on SwapBuffers / Resize (skip frame, force swapchain rebuild on next BeginFrame, bail out only after 60 consecutive failures).
  • Veldrid submodule bump to f85dd26.

• Root the Android Surface managed peer (osu.Android/OsuGameActivity.cs):

  • New heldSurface field + surfaceLock serialise SurfaceCreated / SurfaceDestroyed so SDL/Veldrid can never see a half-torn-down state.
  • Creation publishes the new managed root before swapping in the new global ref, then disposes the previous wrapper after the old ref is gone.
  • Destruction inverts the order: free global ref → drop managed root.
  • GetSurfaceGlobalRef() now uses Volatile.Read for ordered unlocked reads on the SDL hot path.

• Catch up ppy/master through a4f79f7 (PRs Refactor audio preview logic in ranked play cards to match expectations while hopefully not looking buggy anymore ppy/osu#37463 + Apply different workaround to fix ranked play single thread audio issues ppy/osu#37477, ranked play single-thread audio workaround). Conflict in RankedPlayCard.SongPreview.cs resolved in favour of our existing late-bind approach (Enabled/CardHovered subscribed inside the LoadComponentAsync callback, so they cannot fire pre-load — equivalent in effect to upstream's deferred-Schedule). New TestPreviewStopsOnEnteringGameplay brought in.

• Docs/CI: refresh stale 2026.421.1 reference in local-packages/README.md. CI workflows already authenticate to the winnerspiros GitHub Packages feed in every restore job; no version pinning lives outside the .csproj/.props, so nothing else to touch.

Crash-relevant snippet

public void SurfaceDestroyed(ISurfaceHolder holder)
{
    lock (surfaceLock)
    {
        surfaceEvent.Reset();

        // Release the global ref BEFORE dropping the managed root — the inverse
        // of SurfaceCreated. Disposing heldSurface first would let the Java peer
        // be released while a stale global ref to it is still in flight.
        IntPtr oldRef = Interlocked.Exchange(ref surfaceGlobalRef, IntPtr.Zero);
        if (oldRef != IntPtr.Zero)
            JNIEnv.DeleteGlobalRef(oldRef);

        heldSurface?.Dispose();
        heldSurface = null;
    }
}

[gitar-bot]

Important

You are using the Gitar free plan. Upgrade to unlock code review, CI analysis, auto-apply, custom automations, and more.

_Gitar

[Copilot]

Pull request overview

Updates the project to newer ppy.osu.Framework packages and applies an Android Surface lifetime fix intended to prevent SDLActivity JNI crashes after surface loss/recreation, plus a regression test around ranked-play song preview stopping when entering gameplay.

Changes:

• Bump ppy.osu.Framework / ppy.osu.Framework.Android / ppy.osu.Framework.iOS to 2026.422.1.
• Root the Android Surface managed peer (heldSurface) alongside the JNI global ref, and serialize create/destroy to avoid releasing the Java peer while native code still holds a handle.
• Add a visual test asserting ranked-play song previews stop once gameplay is requested; refresh local-packages documentation version reference.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
osu.iOS.props	Bumps ppy.osu.Framework.iOS to 2026.422.1.
osu.Android.props	Bumps ppy.osu.Framework.Android to 2026.422.1.
osu.Game/osu.Game.csproj	Bumps ppy.osu.Framework to 2026.422.1 and updates the pinned-version comment.
osu.Android/OsuGameActivity.cs	Keeps the managed Surface peer alive and tightens create/destroy ordering to prevent JNI crashes.
osu.Game.Tests/Visual/RankedPlay/TestSceneRankedPlayScreen.cs	Adds TestPreviewStopsOnEnteringGameplay regression coverage for song preview shutdown.
local-packages/README.md	Updates the referenced framework version to 2026.422.1.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.