fix(android): Preserve locale timezone extension

Keep the Calendar-based timezone path for Android 13+ locales that carry a Unicode tz extension. This preserves the existing device timezone behavior while keeping the direct default timezone fast path for normal locales.

Co-Authored-By: Claude <noreply@anthropic.com>

Author: adinauer

sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java

@@ -10,6 +10,7 @@
 import android.os.BatteryManager;
 import android.os.Build;
 import android.os.Environment;
+import android.os.LocaleList;
 import android.os.StatFs;
 import android.os.SystemClock;
 import android.util.DisplayMetrics;
@@ -24,6 +25,7 @@
 import io.sentry.protocol.OperatingSystem;
 import io.sentry.util.AutoClosableReentrantLock;
 import java.io.File;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -252,8 +254,18 @@ private void setDeviceIO(
     }
   }
 
+  @SuppressWarnings("NewApi")
   @NotNull
   private TimeZone getTimeZone() {
+    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.TIRAMISU) {
+      LocaleList locales = context.getResources().getConfiguration().getLocales();
+      if (!locales.isEmpty()) {
+        Locale locale = locales.get(0);
+        if (locale.getUnicodeLocaleType("tz") != null) {
+          return Calendar.getInstance(locale).getTimeZone();
+        }
+      }
+    }
     return TimeZone.getDefault();
   }
 

sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt

@@ -2,17 +2,22 @@ package io.sentry.android.core
 
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.BatteryManager
+import android.os.Build
+import android.os.LocaleList
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.android.core.internal.util.CpuInfoUtils
+import java.util.Locale
 import java.util.TimeZone
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
 class DeviceInfoUtilTest {
@@ -56,6 +61,24 @@ class DeviceInfoUtilTest {
     assertEquals(TimeZone.getDefault(), deviceInfo.timezone)
   }
 
+  @Test
+  @Config(sdk = [Build.VERSION_CODES.TIRAMISU])
+  fun `preserves timezone from locale unicode extension`() {
+    val defaultTimeZone = TimeZone.getDefault()
+    try {
+      TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
+      val configuration = Configuration(context.resources.configuration)
+      configuration.setLocales(LocaleList(Locale.forLanguageTag("en-US-u-tz-usnyc")))
+      val localizedContext = context.createConfigurationContext(configuration)
+      val deviceInfoUtil = DeviceInfoUtil(localizedContext, SentryAndroidOptions())
+      val deviceInfo = deviceInfoUtil.collectDeviceInformation(false, false)
+
+      assertEquals("America/New_York", deviceInfo.timezone?.id)
+    } finally {
+      TimeZone.setDefault(defaultTimeZone)
+    }
+  }
+
   @Test
   fun `does include cpu data`() {
     CpuInfoUtils.getInstance().setCpuMaxFrequencies(listOf(1024))