ref(android): Update targetSdk to API 36 (Android 16)

Updates targetSdk and compileSdk to API Level 36 for Android 16 support.

Breaking changes addressed:
- Created ThreadUtil helper for version-aware thread ID retrieval
- Migrated from deprecated Thread.getId() to Thread.threadId() with backward compatibility
- Updated sample app to use OnBackPressedCallback instead of deprecated onBackPressed()

The scheduleAtFixedRate behavior change is acceptable for our performance collection use case.

Author: markushi

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"

sentry-android-core/api/sentry-android-core.api

@@ -659,3 +659,7 @@ public abstract interface class io/sentry/android/core/util/AndroidLazyEvaluator
 	public abstract fun evaluate (Landroid/content/Context;)Ljava/lang/Object;
 }
 
+public final class io/sentry/android/core/util/ThreadUtil {
+	public static fun getThreadId (Ljava/lang/Thread;)J
+}
+

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)

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/AndroidThreadChecker.java

@@ -3,6 +3,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
+import io.sentry.android.core.util.ThreadUtil;
 import io.sentry.protocol.SentryThread;
 import io.sentry.util.thread.IThreadChecker;
 import org.jetbrains.annotations.ApiStatus;
@@ -26,12 +27,12 @@ private AndroidThreadChecker() {
 
   @Override
   public boolean isMainThread(final long threadId) {
-    return Looper.getMainLooper().getThread().getId() == threadId;
+    return ThreadUtil.getThreadId(Looper.getMainLooper().getThread()) == threadId;
   }
 
   @Override
   public boolean isMainThread(final @NotNull Thread thread) {
-    return isMainThread(thread.getId());
+    return isMainThread(ThreadUtil.getThreadId(thread));
   }
 
   @Override

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.util.ThreadUtil;
 import java.util.concurrent.TimeUnit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -129,7 +130,8 @@ public void clear() {
   }
 
   private void setDefaultStartSpanData(final @NotNull ISpan span) {
-    span.setData(SpanDataConvention.THREAD_ID, Looper.getMainLooper().getThread().getId());
+    span.setData(
+        SpanDataConvention.THREAD_ID, ThreadUtil.getThreadId(Looper.getMainLooper().getThread()));
     span.setData(SpanDataConvention.THREAD_NAME, "main");
     span.setData(SpanDataConvention.CONTRIBUTES_TTID, true);
     span.setData(SpanDataConvention.CONTRIBUTES_TTFD, true);

sentry-android-core/src/main/java/io/sentry/android/core/util/ThreadUtil.java

@@ -0,0 +1,38 @@
+package io.sentry.android.core.util;
+
+import android.os.Build;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Utility class for thread-related operations that handles Android version compatibility.
+ *
+ * <p>In Android 16+, {@link Thread#getId()} is deprecated in favor of {@link Thread#threadId()}.
+ * This class provides a version-aware method to retrieve thread IDs that works across all Android
+ * versions.
+ */
+@ApiStatus.Internal
+public final class ThreadUtil {
+
+  private ThreadUtil() {
+    // Utility class, no instances
+  }
+
+  /**
+   * 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.UPSIDE_DOWN_CAKE) {
+      return thread.threadId();
+    } else {
+      return thread.getId();
+    }
+  }
+}

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