Skip to content

Commit eab2b49

Browse files
fix: resolve Android watchdog namespace/Environment compile errors
Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/b4686dc6-d4b0-4635-b193-ad98d6d87983 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
1 parent cdc4cbf commit eab2b49

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

osu.Android/OsuGameActivity.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,11 +1011,11 @@ private void startVulkanUiWatchdog()
10111011
const int watchdog_threshold_ms = 7000;
10121012
const int ping_interval_ms = 1000;
10131013

1014-
Android.OS.Handler? pingHandler;
1014+
global::Android.OS.Handler? pingHandler;
10151015

10161016
try
10171017
{
1018-
pingHandler = new Android.OS.Handler(Android.OS.Looper.MainLooper!);
1018+
pingHandler = new global::Android.OS.Handler(global::Android.OS.Looper.MainLooper!);
10191019
}
10201020
catch (Exception e)
10211021
{
@@ -1027,7 +1027,7 @@ private void startVulkanUiWatchdog()
10271027
// Interlocked/Volatile access: the pong runs on the UI thread, the reader runs
10281028
// on the watchdog thread. The field is a reference so it can be captured by
10291029
// both lambdas without a ref capture.
1030-
long[] lastPongMonotonicMs = { Environment.TickCount64 };
1030+
long[] lastPongMonotonicMs = { System.Environment.TickCount64 };
10311031

10321032
// Self-rescheduling pong: posts itself every ping_interval_ms on the UI thread.
10331033
// Capturing pingHandler via a local ref rather than the outer variable so the
@@ -1036,7 +1036,7 @@ private void startVulkanUiWatchdog()
10361036
Action? pong = null;
10371037
pong = () =>
10381038
{
1039-
System.Threading.Volatile.Write(ref lastPongMonotonicMs[0], Environment.TickCount64);
1039+
System.Threading.Volatile.Write(ref lastPongMonotonicMs[0], System.Environment.TickCount64);
10401040

10411041
try { pingHandler.PostDelayed(pong!, ping_interval_ms); }
10421042
catch { /* handler gone (process teardown) — stop rescheduling */ }
@@ -1062,7 +1062,7 @@ private void startVulkanUiWatchdog()
10621062

10631063
while (true)
10641064
{
1065-
long age = Environment.TickCount64 - System.Threading.Volatile.Read(ref lastPongMonotonicMs[0]);
1065+
long age = System.Environment.TickCount64 - System.Threading.Volatile.Read(ref lastPongMonotonicMs[0]);
10661066

10671067
if (age > watchdog_threshold_ms)
10681068
{

0 commit comments

Comments
 (0)