Merge 55df841 into 96eeafa

markushi · web-flow · commit 8c920a742e50 · 2026-01-22T08:21:28.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# Unreleased
+
+### Improvements
+
+- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
+
 ## 8.31.0
 
 ### Features
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,8 +34,8 @@ springboot2 = "2.7.18"
 springboot3 = "3.5.0"
 springboot4 = "4.0.0"
 # Android
-targetSdk = "34"
-compileSdk = "34"
+targetSdk = "36"
+compileSdk = "36"
 minSdk = "21"
 spotless = "7.0.4"
 gummyBears = "0.12.0"
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/AppComponentsBreadcrumbsIntegration.java
@@ -98,6 +98,7 @@ public void onConfigurationChanged(@NotNull Configuration newConfig) {
     executeInBackground(() -> captureConfigurationChangedBreadcrumb(now, newConfig));
   }
 
+  @SuppressWarnings("deprecation")
   @Override
   public void onLowMemory() {
     // we do this in onTrimMemory below already, this is legacy API (14 or below)
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java b/sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java
@@ -1,5 +1,6 @@
 package io.sentry.android.core.internal.util;
 
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
@@ -24,14 +25,32 @@ private AndroidThreadChecker() {
     new Handler(Looper.getMainLooper()).post(() -> mainThreadSystemId = Process.myTid());
   }
 
+  /**
+   * Gets the thread ID in a way that's compatible across Android versions.
+   *
+   * <p>Uses {@link Thread#threadId()} on Android 14 (API 34) and above, and falls back to {@link
+   * Thread#getId()} on older versions.
+   *
+   * @param thread the thread to get the ID for
+   * @return the thread ID
+   */
+  @SuppressWarnings("deprecation")
+  public static long getThreadId(final @NotNull Thread thread) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA) {
+      return thread.threadId();
+    } else {
+      return thread.getId();
+    }
+  }
+
   @Override
   public boolean isMainThread(final long threadId) {
-    return Looper.getMainLooper().getThread().getId() == threadId;
+    return getThreadId(Looper.getMainLooper().getThread()) == threadId;
   }
 
   @Override
   public boolean isMainThread(final @NotNull Thread thread) {
-    return isMainThread(thread.getId());
+    return isMainThread(getThreadId(thread));
   }
 
   @Override
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelper.java b/sentry-android-core/src/main/java/io/sentry/android/core/performance/ActivityLifecycleSpanHelper.java
@@ -8,6 +8,7 @@
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanStatus;
 import io.sentry.android.core.AndroidDateUtils;
+import io.sentry.android.core.internal.util.AndroidThreadChecker;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -129,7 +130,9 @@ public void clear() {
   }
 
   private void setDefaultStartSpanData(final @NotNull ISpan span) {
-    span.setData(SpanDataConvention.THREAD_ID, Looper.getMainLooper().getThread().getId());
+    span.setData(
+        SpanDataConvention.THREAD_ID,
+        AndroidThreadChecker.getThreadId(Looper.getMainLooper().getThread()));
     span.setData(SpanDataConvention.THREAD_NAME, "main");
     span.setData(SpanDataConvention.CONTRIBUTES_TTID, true);
     span.setData(SpanDataConvention.CONTRIBUTES_TTFD, true);
diff --git a/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt b/sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/ProfilingActivity.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.widget.SeekBar
 import android.widget.Toast
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.sentry.ITransaction
@@ -24,6 +25,21 @@ class ProfilingActivity : AppCompatActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
+
+    onBackPressedDispatcher.addCallback(
+      this,
+      object : OnBackPressedCallback(true) {
+        override fun handleOnBackPressed() {
+          if (profileFinished) {
+            isEnabled = false
+            onBackPressedDispatcher.onBackPressed()
+          } else {
+            Toast.makeText(this@ProfilingActivity, R.string.profiling_running, Toast.LENGTH_SHORT)
+              .show()
+          }
+        }
+      },
+    )
     binding = ActivityProfilingBinding.inflate(layoutInflater)
 
     binding.profilingDurationSeekbar.setOnSeekBarChangeListener(
@@ -156,14 +172,6 @@ class ProfilingActivity : AppCompatActivity() {
       else -> fibonacci(n - 1) + fibonacci(n - 2)
     }
 
-  override fun onBackPressed() {
-    if (profileFinished) {
-      super.onBackPressed()
-    } else {
-      Toast.makeText(this, R.string.profiling_running, Toast.LENGTH_SHORT).show()
-    }
-  }
-
   private fun getProfileDuration(): Float {
     // Minimum duration of the profile is 100 milliseconds
     return binding.profilingDurationSeekbar.progress / 10.0F + 0.1F

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ public void onConfigurationChanged(@NotNull Configuration newConfig) {`
`98`	`98`	`executeInBackground(() -> captureConfigurationChangedBreadcrumb(now, newConfig));`
`99`	`99`	`}`
`100`	`100`
	`101`	`+ @SuppressWarnings("deprecation")`
`101`	`102`	`@Override`
`102`	`103`	`public void onLowMemory() {`
`103`	`104`	`// we do this in onTrimMemory below already, this is legacy API (14 or below)`