Merge pull request #269 from winnerspiros/copilot/fix-s-pen-issues-and-update

Fix S Pen stuck top-left and rewrite Oboe redirection via GlobalMixerHandle

Author: winnerspiros

logs.zip

@@ -83,6 +83,19 @@
          spikes on the Update/Draw threads. Memory usage rises ~20-30% in exchange. -->
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
+    <!-- Defensive explicit-set: we rely on the SDK linker to walk only Android SDK types
+         (NOT user assemblies — see PublishTrimmed=off rationale above). The .NET Android
+         SDK default is currently 'SdkOnly' but has changed across SDK versions; making it
+         explicit here pins the behaviour so a future SDK bump cannot silently flip us to
+         'Full' linking and break the reflection-heavy code paths in osu.Game / Realm /
+         Newtonsoft.Json / AutoMapper / Sentry / OsuTK. -->
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
+    <!-- Defensive explicit-set: keep IL alongside profiled-AOT native code so any method
+         outside the bundled AOT profile has a JIT fallback (instead of MissingMethodException
+         at first call). The .NET Android SDK default is 'false' for non-trimmed builds
+         already, but we make it explicit so a future SDK bump cannot silently start
+         stripping IL and reproduce the trim-then-AOT crash class we removed above. -->
+    <AndroidStripILAfterAOT>false</AndroidStripILAfterAOT>
   </PropertyGroup>
 
   <ItemGroup>

native_crash.log

@@ -10,7 +10,7 @@
 	  reaches DispatchKeyEvent and the OS default for root-task activities (moveTaskToBack,
 	  i.e. minimise) takes over instead.
 	-->
-	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" android:largeHeap="true" android:hardwareAccelerated="true" android:extractNativeLibs="false" android:enableOnBackInvokedCallback="false">
+	<application android:allowBackup="true" android:supportsRtl="true" android:label="osu!" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher" android:largeHeap="true" android:hardwareAccelerated="true" android:extractNativeLibs="false" android:enableOnBackInvokedCallback="false" android:appCategory="game">
         <provider android:name="androidx.core.content.FileProvider" android:authorities="sh.ppy.osulazer.fileprovider" android:grantUriPermissions="true" android:exported="false">
             <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/filepaths" />
         </provider>
@@ -20,5 +20,14 @@
              This enables vendor-specific optimizations (performance boost, thermal management,
              display refresh rate priority) on Samsung devices automatically. -->
         <meta-data android:name="com.samsung.android.game.biz" android:value="true" />
+        <!-- Android 13+ Game Mode opt-out (https://developer.android.com/games/gamemode/gamemode-api).
+             We explicitly disable Battery- and Performance-mode interventions, FPS override, and
+             downscaling. A rhythm game's input-to-audio latency budget is hard-bound by the
+             active refresh rate and the audio burst cadence — letting the OS Game Manager cap
+             our framerate (typical "battery saver" downscale: 60Hz → 30Hz) or downscale our
+             render resolution (typical "battery saver" downscale: 100% → 75%) breaks both
+             timing accuracy AND visual hit-circle alignment. We already manage thermals, refresh
+             rate, and sustained performance ourselves (see OsuGameAndroid.LoadComplete). -->
+        <meta-data android:name="android.game_mode_config" android:resource="@xml/gamemode_config" />
     </application>
 </manifest>

osu.Android.props

@@ -86,11 +86,18 @@ private void handlePointer(MotionEvent e, int historyIndex)
             // into Escape for menu navigation (README: "Mouse back button = Escape"); the
             // small overlap on those devices is harmless because Button1 has no default
             // binding in osu! and so cannot trigger an unintended gameplay hit.
-            bool left = (e.ButtonState & MotionEventButtonState.Primary) != 0;
-            bool right = (e.ButtonState & MotionEventButtonState.Secondary) != 0;
-            bool middle = (e.ButtonState & MotionEventButtonState.Tertiary) != 0;
-            bool back = (e.ButtonState & MotionEventButtonState.Back) != 0;
-            bool forward = (e.ButtonState & MotionEventButtonState.Forward) != 0;
+            //
+            // Cache ButtonState into a local before the five bit-tests below: each access
+            // of `e.ButtonState` is a JNI method call into MotionEvent#getButtonState, and
+            // on a multi-button mouse a single Move sample with HistorySize=20 ends up
+            // doing 5 × 21 = 105 redundant JNI crossings per event. Folding to a single
+            // read drops that to 21 crossings (only the per-sample one we cannot avoid).
+            var buttonState = e.ButtonState;
+            bool left = (buttonState & MotionEventButtonState.Primary) != 0;
+            bool right = (buttonState & MotionEventButtonState.Secondary) != 0;
+            bool middle = (buttonState & MotionEventButtonState.Tertiary) != 0;
+            bool back = (buttonState & MotionEventButtonState.Back) != 0;
+            bool forward = (buttonState & MotionEventButtonState.Forward) != 0;
 
             if (left != lastLeft) { PendingInputs.Enqueue(new MouseButtonInput(MouseButton.Left, left)); lastLeft = left; }
             if (right != lastRight) { PendingInputs.Enqueue(new MouseButtonInput(MouseButton.Right, right)); lastRight = right; }

osu.Android/AndroidManifest.xml

@@ -138,25 +138,33 @@ public bool HandleMotionEvent(MotionEvent e)
         {
             if (!Enabled.Value) return false;
 
-            if (e.ActionMasked == MotionEventActions.HoverExit || e.ActionMasked == MotionEventActions.Up || e.ActionMasked == MotionEventActions.Cancel)
+            // Cache ActionMasked once: each `e.ActionMasked` access is a JNI call into
+            // MotionEvent#getActionMasked. On a busy stylus drag the previous code did
+            // 3 reads per event (here + 2 in handlePointer) and HistorySize+1 calls to
+            // handlePointer; folding to a single read trims the per-event JNI crossings
+            // by ~2 + 2*(HistorySize+1) at no cost.
+            var actionMasked = e.ActionMasked;
+
+            if (actionMasked == MotionEventActions.HoverExit || actionMasked == MotionEventActions.Up || actionMasked == MotionEventActions.Cancel)
             {
                 if (lastLeftDown) { PendingInputs.Enqueue(new MouseButtonInput(MouseButton.Left, false)); lastLeftDown = false; }
 
-                if (e.ActionMasked != MotionEventActions.HoverExit)
+                if (actionMasked != MotionEventActions.HoverExit)
                     return true;
             }
 
             // Process all batched historical events for maximum accuracy.
-            for (int i = 0; i < e.HistorySize; i++)
-                handlePointer(e, i);
+            int historySize = e.HistorySize;
+            for (int i = 0; i < historySize; i++)
+                handlePointer(e, i, actionMasked);
 
-            handlePointer(e, -1);
+            handlePointer(e, -1, actionMasked);
 
             return true;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void handlePointer(MotionEvent e, int historyIndex)
+        private void handlePointer(MotionEvent e, int historyIndex, MotionEventActions actionMasked)
         {
             const int pointer_index = 0;
             if (e.PointerCount <= pointer_index) return;
@@ -210,8 +218,12 @@ private void handlePointer(MotionEvent e, int historyIndex)
 
             // Button state: pressure-based click (primary) with action overrides.
             // Uses the cached threshold field rather than `PressureThreshold.Value` to skip the
-            // per-event bindable read.
-            var actionMasked = e.ActionMasked;
+            // per-event bindable read. `actionMasked` is a parameter (cached once at the top of
+            // HandleMotionEvent) so we avoid the JNI crossing for `e.ActionMasked` here.
+            // ButtonState is a single JNI read per pointer (vs. desktop mouse which we already
+            // hoist) — Move-with-Primary is the only path that needs it and stylus side-buttons
+            // are intentionally NOT mapped to right/middle (see comment block below), so a single
+            // read is unavoidable but bounded.
             var buttonState = e.ButtonState;
             bool isLeftDown = pressure >= cachedPressureThreshold;
             if (actionMasked == MotionEventActions.Down || actionMasked == MotionEventActions.ButtonPress) isLeftDown = true;