Merge pull request #754 from DataDog/xgouchet/RUMM-1759/crash_uncaught_exception

RUMM-1759 Prevent crash on uncaught exception

Author: xgouchet

dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/thread/ThreadExt.kt

@@ -0,0 +1,33 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+
+package com.datadog.android.core.internal.thread
+
+import com.datadog.android.core.internal.utils.sdkLogger
+
+/**
+ * A utility method to perform a Thread.sleep() safely.
+ * @return whether the thread was interrupted during the sleep
+ */
+internal fun sleepSafe(durationMs: Long): Boolean {
+    try {
+        Thread.sleep(durationMs)
+        return false
+    } catch (e: InterruptedException) {
+        try {
+            // Restore the interrupted status
+            Thread.currentThread().interrupt()
+        } catch (se: SecurityException) {
+            // this should not happen
+            sdkLogger.e("Thread was unable to set its own interrupted state", se)
+        }
+        return true
+    } catch (e: IllegalArgumentException) {
+        // This means we tried sleeping for a negative time
+        sdkLogger.w("Thread tried to sleep for a negative amount of time", e)
+        return false
+    }
+}

dd-sdk-android/src/main/kotlin/com/datadog/android/core/internal/thread/ThreadPoolExecutorExt.kt

@@ -15,12 +15,17 @@ internal fun ThreadPoolExecutor.waitToIdle(timeoutInMs: Long): Boolean {
     val startTime = System.nanoTime()
     val timeoutInNs = TimeUnit.MILLISECONDS.toNanos(timeoutInMs)
     val sleepDurationInMs = timeoutInMs.coerceIn(0, MAX_SLEEP_DURATION_IN_MS)
+    var interrupted: Boolean
     do {
-        if (this.taskCount - this.completedTaskCount <= 0) {
+        if (isIdle()) {
             return true
         }
-        Thread.sleep(sleepDurationInMs)
-    } while ((System.nanoTime() - startTime) < timeoutInNs)
+        interrupted = sleepSafe(sleepDurationInMs)
+    } while (((System.nanoTime() - startTime) < timeoutInNs) && !interrupted)
 
-    return false
+    return isIdle()
+}
+
+internal fun ThreadPoolExecutor.isIdle(): Boolean {
+    return (this.taskCount - this.completedTaskCount <= 0)
 }