From ee9be27e3b87ce0a2ee0faba020c206430f836e8 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 3 Oct 2024 13:03:00 +0300 Subject: [PATCH 1/2] Revert #1991 changes to analytics --- .../com.unity.inputsystem/InputSystem/NativeInputRuntime.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs index 5c4c4a2734..f82d5fa8b3 100644 --- a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs +++ b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs @@ -393,6 +393,7 @@ public Action onProjectChange public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) { + #if ENABLE_CLOUD_SERVICES_ANALYTICS #if (UNITY_EDITOR) #if (UNITY_2023_2_OR_NEWER) EditorAnalytics.SendAnalytic(analytic); @@ -404,7 +405,7 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) EditorAnalytics.SendEventWithLimit(info.Name, analytic); #endif // UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER #endif // UNITY_2023_2_OR_NEWER - #elif (ENABLE_CLOUD_SERVICES_ANALYTICS) // Implicitly: !UNITY_EDITOR && UNITY_ANALYTICS + #elif (UNITY_ANALYTICS) // Implicitly: !UNITY_EDITOR var info = analytic.info; Analytics.Analytics.RegisterEvent(info.Name, info.MaxEventsPerHour, info.MaxNumberOfElements, InputAnalytics.kVendorKey); if (analytic.TryGatherData(out var data, out var error)) @@ -412,6 +413,7 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic) else Debug.Log(error); // Non fatal #endif //UNITY_EDITOR + #endif //ENABLE_CLOUD_SERVICES_ANALYTICS } #endif // UNITY_ANALYTICS || UNITY_EDITOR From 47a4f2584844a71a034deffc7a519fd2495d3347 Mon Sep 17 00:00:00 2001 From: Paulius Dervinis Date: Thu, 3 Oct 2024 13:07:39 +0300 Subject: [PATCH 2/2] Update CHANGELOG.md --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index f8e32c4e35..3ed6338905 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -13,6 +13,7 @@ however, it has to be formatted properly to pass verification tests. ### Fixed - Fixed touch pointers being released twice causing an index out of bounds error. [ISXB-687](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-687) - Fixed `NullReferenceException` from disconnecting and reconnecting a GXDKGamepad. +- Fixed "AnalyticsResult" errors on consoles [ISXB-1107] ### Added - Added the display of the device flag `CanRunInBackground` in device debug view.