From 0a9b61daaf5ce22872af4139a888985a0baf26d5 Mon Sep 17 00:00:00 2001
From: Mobile Ads Developer Relations <mad-devrel-noreply@google.com>
Date: Mon, 10 Nov 2025 17:21:16 -0800
Subject: [PATCH] No public description

PiperOrigin-RevId: 830660533
---
 .../GoogleMobileAds/Common/JspbConverter.cs   | 45 ++++++++++---------
 .../Platforms/Android/MobileAdsClient.cs      |  3 +-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/source/plugin/Assets/GoogleMobileAds/Common/JspbConverter.cs b/source/plugin/Assets/GoogleMobileAds/Common/JspbConverter.cs
index 27aa04523..ea1265bba 100644
--- a/source/plugin/Assets/GoogleMobileAds/Common/JspbConverter.cs
+++ b/source/plugin/Assets/GoogleMobileAds/Common/JspbConverter.cs
@@ -114,27 +114,30 @@ internal static string ToJspb(ExceptionLoggablePayload payload)
         // VisibleForTesting
         internal static string ToJspb(ExceptionReport report)
         {
-            return string.Format(
-                "[{0},{1},{2},{3},{4},{5},{6},{7},{8},{9},{10},{11},{12},{13},{14},{15},{16},{17},{18}]",
-                QuoteString(report.time_msec),
-                report.trapped.ToString().ToLower(),
-                QuoteString(report.name),
-                QuoteString(report.exception_class),
-                QuoteString(report.top_exception),
-                QuoteString(report.stacktrace),
-                QuoteString(report.stacktrace_hash),
-                QuoteString(report.session_id),
-                QuoteString(report.app_id),
-                QuoteString(report.app_version_name),
-                QuoteString(report.platform),
-                QuoteString(report.unity_version),
-                QuoteString(report.os_version),
-                QuoteString(report.device_model),
-                QuoteString(report.country),
-                report.total_cpu,
-                QuoteString(report.total_memory_bytes),
-                QuoteString(report.network_type),
-                QuoteString(report.orientation));
+            // The order must match the proto field numbers.
+            var fields = new List<string>
+            {
+                QuoteString(report.time_msec), // 1
+                report.trapped.ToString().ToLower(), // 2
+                QuoteString(report.name), // 3
+                QuoteString(report.exception_class), // 4
+                QuoteString(report.top_exception), // 5
+                QuoteString(report.stacktrace), // 6
+                QuoteString(report.platform), // 7
+                QuoteString(report.app_version_name), // 8
+                QuoteString(report.app_id), // 9
+                QuoteString(report.os_version), // 10
+                QuoteString(report.device_model), // 11
+                report.total_cpu.ToString(), // 12
+                QuoteString(report.total_memory_bytes), // 13
+                QuoteString(report.country), // 14
+                QuoteString(report.orientation), // 15
+                QuoteString(report.network_type), // 16
+                QuoteString(report.session_id), // 17
+                QuoteString(report.stacktrace_hash), // 18
+                QuoteString(report.unity_version) // 19
+            };
+            return string.Format("[{0}]", string.Join(",", fields.ToArray()));
         }
         #endregion
     }
diff --git a/source/plugin/Assets/GoogleMobileAds/Platforms/Android/MobileAdsClient.cs b/source/plugin/Assets/GoogleMobileAds/Platforms/Android/MobileAdsClient.cs
index cb5742b7d..e91b4ee46 100644
--- a/source/plugin/Assets/GoogleMobileAds/Platforms/Android/MobileAdsClient.cs
+++ b/source/plugin/Assets/GoogleMobileAds/Platforms/Android/MobileAdsClient.cs
@@ -183,10 +183,11 @@ public void onInitializationComplete(AndroidJavaObject initStatus)
               var assemblyVersion = assembly.GetName().Version;
               nativePluginVersion = string.Format("{0}.{1}.{2}", assemblyVersion.Major,
                                                   assemblyVersion.Minor, assemblyVersion.Revision);
+              throw new Exception("TEST EXCEPTION // jochac");
             } catch (Exception e) {
               if (GlobalExceptionHandler.Instance != null)
               {
-                GlobalExceptionHandler.Instance.ReportTrappedException(e);
+                GlobalExceptionHandler.Instance.ReportTrappedException(e, "jochac");
               }
             }
             string versionString = AdRequest.BuildVersionString(nativePluginVersion);