From 9a7f8b3a007d226dc6404cb4e65e14c80b5fdd66 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 30 Oct 2026 10:30:30 +0200 Subject: [PATCH 1/2] Replace CustomSampler with ProfilerMarker in AndroidLogcatDispatcher Cherry-picked from #230 (AndroidLogcatDispatcher.cs only). Co-Authored-By: Claude Opus 5.5 --- .../Editor/Tasks/AndroidLogcatDispatcher.cs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/com.unity.mobile.android-logcat/Editor/Tasks/AndroidLogcatDispatcher.cs b/com.unity.mobile.android-logcat/Editor/Tasks/AndroidLogcatDispatcher.cs index b2aa2c3d..a82357ff 100644 --- a/com.unity.mobile.android-logcat/Editor/Tasks/AndroidLogcatDispatcher.cs +++ b/com.unity.mobile.android-logcat/Editor/Tasks/AndroidLogcatDispatcher.cs @@ -22,7 +22,7 @@ private class AsyncTask internal Action integrateAction; } - CustomSampler m_Sampler; + static readonly Unity.Profiling.ProfilerMarker s_AsyncWorkMarker = new Unity.Profiling.ProfilerMarker("AndroidLogcat Async Work"); private Queue m_AsyncTaskQueue = new Queue(); private Queue m_IntegrateTaskQueue = new Queue(); @@ -54,8 +54,6 @@ internal void Initialize() m_Runtime.Update += IntegrateMainThread; ThreadPool.QueueUserWorkItem(WorkerThread); - m_Sampler = CustomSampler.Create("AndroidLogcat Async Work"); - s_MainThread = Thread.CurrentThread; } @@ -117,9 +115,9 @@ private void WorkerThread(object o) try { - m_Sampler.Begin(); + s_AsyncWorkMarker.Begin(); var result = task.asyncAction.Invoke(task.taskData); - m_Sampler.End(); + s_AsyncWorkMarker.End(); if (task.integrateAction != null) { From a744e3897413246148e0bcc7084eff1ff9ab3138 Mon Sep 17 00:00:00 2001 From: Tomas Date: Fri, 30 Oct 2026 12:13:30 +0200 Subject: [PATCH 2/2] fix references --- .../Tests/Editor/AndroidLogcatNetTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs index 45e5d2d0..d53a1e2a 100644 --- a/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs +++ b/com.unity.mobile.android-logcat/Tests/Editor/AndroidLogcatNetTests.cs @@ -73,6 +73,7 @@ static bool IsFrameworkReference(string name) => { "UnityEngine.ScriptingModule", "UnityEngine.UICommonModule", + "UnityEngine.TypeRegistryModule", }); #endif