From 093c050e1020c3a514367833320619ae270cd101 Mon Sep 17 00:00:00 2001
From: Alexander Dinauer <adinauer@users.noreply.github.com>
Date: Mon, 22 Jun 2026 14:02:02 +0200
Subject: [PATCH] perf(android): Use TimeZone.getDefault for device timezone

Avoid constructing a Calendar only to read the default device timezone. The locale passed to Calendar does not affect the timezone value, so TimeZone.getDefault returns the same value with less work during device context collection.

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .../java/io/sentry/android/core/DeviceInfoUtil.java  | 12 +-----------
 .../io/sentry/android/core/DeviceInfoUtilTest.kt     |  9 +++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java b/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java
index f3b17c5854a..938e6737c17 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/DeviceInfoUtil.java
@@ -10,7 +10,6 @@
 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;
@@ -25,7 +24,6 @@
 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;
@@ -254,17 +252,9 @@ private void setDeviceIO(
     }
   }
 
-  @SuppressWarnings("NewApi")
   @NotNull
   private TimeZone getTimeZone() {
-    if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.N) {
-      LocaleList locales = context.getResources().getConfiguration().getLocales();
-      if (!locales.isEmpty()) {
-        Locale locale = locales.get(0);
-        return Calendar.getInstance(locale).getTimeZone();
-      }
-    }
-    return Calendar.getInstance().getTimeZone();
+    return TimeZone.getDefault();
   }
 
   @SuppressWarnings("JdkObsolete")
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt
index 6d90d6be538..287c44985af 100644
--- a/sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt
+++ b/sentry-android-core/src/test/java/io/sentry/android/core/DeviceInfoUtilTest.kt
@@ -6,6 +6,7 @@ import android.os.BatteryManager
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.sentry.android.core.internal.util.CpuInfoUtils
+import java.util.TimeZone
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -47,6 +48,14 @@ class DeviceInfoUtilTest {
     assertNotNull(deviceInfo.memorySize)
   }
 
+  @Test
+  fun `sets default timezone`() {
+    val deviceInfoUtil = DeviceInfoUtil.getInstance(context, SentryAndroidOptions())
+    val deviceInfo = deviceInfoUtil.collectDeviceInformation(false, false)
+
+    assertEquals(TimeZone.getDefault(), deviceInfo.timezone)
+  }
+
   @Test
   fun `does include cpu data`() {
     CpuInfoUtils.getInstance().setCpuMaxFrequencies(listOf(1024))