added try catch to AndroidRuntimeManager.runWithRelaxedPolicy

Author: stefanosiano

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

@@ -13,9 +13,11 @@ public <T> T runWithRelaxedPolicy(final @NotNull IRuntimeManagerCallback<T> toRu
     final @NotNull StrictMode.VmPolicy oldVmPolicy = StrictMode.getVmPolicy();
     StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.LAX);
     StrictMode.setVmPolicy(StrictMode.VmPolicy.LAX);
-    final @NotNull T t = toRun.run();
-    StrictMode.setThreadPolicy(oldPolicy);
-    StrictMode.setVmPolicy(oldVmPolicy);
-    return t;
+    try {
+      return toRun.run();
+    } finally {
+      StrictMode.setThreadPolicy(oldPolicy);
+      StrictMode.setVmPolicy(oldVmPolicy);
+    }
   }
 }

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/AndroidRuntimeManagerTest.kt

@@ -53,4 +53,35 @@ class AndroidRuntimeManagerTest {
     // Ensure the code ran
     assertTrue(called)
   }
+
+  @Test
+  fun `runWithRelaxedPolicy changes policy and restores it afterwards even if the code throws`() {
+    var called = false
+    val threadPolicy = StrictMode.ThreadPolicy.Builder().detectAll().penaltyDeath().build()
+    val vmPolicy = StrictMode.VmPolicy.Builder().detectAll().penaltyDeath().build()
+
+    // Set and assert the StrictMode policies
+    StrictMode.setThreadPolicy(threadPolicy)
+    StrictMode.setVmPolicy(vmPolicy)
+
+    // Run the function and assert LAX policies
+    try {
+      sut.runWithRelaxedPolicy {
+        assertEquals(
+          StrictMode.ThreadPolicy.LAX.toString(),
+          StrictMode.getThreadPolicy().toString(),
+        )
+        assertEquals(StrictMode.VmPolicy.LAX.toString(), StrictMode.getVmPolicy().toString())
+        called = true
+        throw Exception("Test exception")
+      }
+    } catch (_: Exception) {}
+
+    // Policies should be reverted back
+    assertEquals(threadPolicy.toString(), StrictMode.getThreadPolicy().toString())
+    assertEquals(vmPolicy.toString(), StrictMode.getVmPolicy().toString())
+
+    // Ensure the code ran
+    assertTrue(called)
+  }
 }