Merge branch 'main' into markushi/fix/session-replay-jetpack-composes-masking

Author: markushi

CHANGELOG.md

@@ -12,6 +12,7 @@
 - Session Replay: Do not capture current replay for cached events from the past ([#4474](https://github.com/getsentry/sentry-java/pull/4474))
 - Session Replay: Correctly capture Dialogs and non full-sized windows ([#4354](https://github.com/getsentry/sentry-java/pull/4354))
 - Session Replay: Fix inconsistent `segment_id` ([#4471](https://github.com/getsentry/sentry-java/pull/4471))
+- Session Replay: Fix crash on devices with the Unisoc/Spreadtrum T606 chipset ([#4477](https://github.com/getsentry/sentry-java/pull/4477))
 
 ## 8.13.2
 

build-logic/src/main/kotlin/io.sentry.javadoc.aggregate.gradle.kts

@@ -20,7 +20,7 @@ subprojects {
 
 val javadocCollection = javadocPublisher.incoming.artifactView { lenient(true) }.files
 
-tasks.register("aggregateJavadoc", AggregateJavadoc::class) {
+tasks.register("aggregateJavadocs", AggregateJavadoc::class) {
     group = "documentation"
     description = "Aggregates Javadocs from all subprojects into a single directory."
     javadocFiles.set(javadocCollection)

sentry-android-replay/src/main/java/io/sentry/android/replay/util/SystemProperties.kt

@@ -0,0 +1,21 @@
+package io.sentry.android.replay.util
+
+import android.os.Build
+
+internal object SystemProperties {
+    enum class Property {
+        SOC_MODEL,
+        SOC_MANUFACTURER
+    }
+
+    fun get(key: Property, defaultValue: String = ""): String {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            when (key) {
+                Property.SOC_MODEL -> Build.SOC_MODEL
+                Property.SOC_MANUFACTURER -> Build.SOC_MANUFACTURER
+            }
+        } else {
+            defaultValue
+        }
+    }
+}

sentry-android-replay/src/main/java/io/sentry/android/replay/video/SimpleVideoEncoder.kt

@@ -39,6 +39,7 @@ import android.os.Build
 import android.view.Surface
 import io.sentry.SentryLevel.DEBUG
 import io.sentry.SentryOptions
+import io.sentry.android.replay.util.SystemProperties
 import java.io.File
 import java.nio.ByteBuffer
 import kotlin.LazyThreadSafetyMode.NONE
@@ -155,11 +156,20 @@ internal class SimpleVideoEncoder(
     }
 
     fun encode(image: Bitmap) {
-        // it seems that Xiaomi devices have problems with hardware canvas, so we have to use
-        // lockCanvas instead https://stackoverflow.com/a/73520742
+        /** it seems that Xiaomi devices have problems with hardware canvas, so we have to use
+         * lockCanvas instead https://stackoverflow.com/a/73520742
+         * ---
+         * Same for Motorola devices.
+         * ---
+         * As for the T606, it's a Spreadtrum/Unisoc chipset and can be spread across various
+         * devices, so we have to check the SOC_MODEL property, as the manufacturer name might have
+         * changed.
+         * https://github.com/getsentry/sentry-android-gradle-plugin/issues/861#issuecomment-2867021256
+         */
         val canvas = if (
             Build.MANUFACTURER.contains("xiaomi", ignoreCase = true) ||
-            Build.MANUFACTURER.contains("motorola", ignoreCase = true)
+            Build.MANUFACTURER.contains("motorola", ignoreCase = true) ||
+            SystemProperties.get(SystemProperties.Property.SOC_MODEL).equals("T606", ignoreCase = true)
         ) {
             surface?.lockCanvas(null)
         } else {