Merge pull request #2723 from DataDog/yl/fix-drawable-utils-crash

RUM-9527: Defer drawable copy to work thread in Session Replay

Author: ambushwork

features/dd-sdk-android-session-replay/src/main/kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolver.kt

@@ -137,21 +137,24 @@ internal class ResourceResolver(
             return
         }
 
-        val copiedDrawable = drawableCopier.copy(originalDrawable, resources)
-        if (copiedDrawable == null) {
-            resourceResolverCallback.onFailure()
-            return
-        }
-
-        val bitmapFromDrawable =
-            if (copiedDrawable is BitmapDrawable && shouldUseDrawableBitmap(copiedDrawable)) {
-                copiedDrawable.bitmap // cannot be null - we already checked in shouldUseDrawableBitmap
-            } else {
-                null
-            }
-
         // do in the background
         threadPoolExecutor.executeSafe(RESOURCE_RESOLVER_ALIAS, logger) {
+            // Copy the drawable on work thread in order to avoid the new MaterialShapeDrawable
+            // instance to reuse the singleton of `ShapeAppearancePathProvider` from main thread,
+            // causing UI thread drawing crash.
+            val copiedDrawable = drawableCopier.copy(originalDrawable, resources)
+            if (copiedDrawable == null) {
+                resourceResolverCallback.onFailure()
+                return@executeSafe
+            }
+
+            val bitmapFromDrawable =
+                if (copiedDrawable is BitmapDrawable && shouldUseDrawableBitmap(copiedDrawable)) {
+                    copiedDrawable.bitmap // cannot be null - we already checked in shouldUseDrawableBitmap
+                } else {
+                    null
+                }
+
             createBitmapFromDrawable(
                 drawable = originalDrawable,
                 copiedDrawable = copiedDrawable,

features/dd-sdk-android-session-replay/src/test/kotlin/com/datadog/android/sessionreplay/internal/recorder/resources/ResourceResolverTest.kt

@@ -1090,4 +1090,59 @@ internal class ResourceResolverTest {
             bitmapCreationCallback = any()
         )
     }
+
+    @Test
+    fun `M only copy the drawable in work thread W resolveResourceIdFromDrawable`() {
+        // Given
+        whenever(
+            mockExecutorService.execute(
+                any()
+            )
+        ).then {
+            // do nothing to simulate that work thread doesn't execute the task.
+            mock<Future<Boolean>>()
+        }
+
+        // When
+        testedResourceResolver.resolveResourceIdFromDrawable(
+            resources = mockResources,
+            applicationContext = mockApplicationContext,
+            displayMetrics = mockDisplayMetrics,
+            originalDrawable = mockDrawable,
+            drawableCopier = mockDrawableCopier,
+            drawableWidth = mockDrawable.intrinsicWidth,
+            drawableHeight = mockDrawable.intrinsicHeight,
+            customResourceIdCacheKey = null,
+            resourceResolverCallback = mockSerializerCallback
+        )
+
+        // Then
+        verifyNoInteractions(mockDrawableCopier)
+
+        // Given
+        whenever(
+            mockExecutorService.execute(
+                any()
+            )
+        ).then {
+            (it.arguments[0] as Runnable).run()
+            mock<Future<Boolean>>()
+        }
+
+        // When
+        testedResourceResolver.resolveResourceIdFromDrawable(
+            resources = mockResources,
+            applicationContext = mockApplicationContext,
+            displayMetrics = mockDisplayMetrics,
+            originalDrawable = mockDrawable,
+            drawableCopier = mockDrawableCopier,
+            drawableWidth = mockDrawable.intrinsicWidth,
+            drawableHeight = mockDrawable.intrinsicHeight,
+            customResourceIdCacheKey = null,
+            resourceResolverCallback = mockSerializerCallback
+        )
+
+        // Then
+        verify(mockDrawableCopier).copy(mockDrawable, mockResources)
+    }
 }