From 3bf71ef655fdb5e0e93aabb4834b06fded37a32b Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 22 Sep 2020 15:04:06 -0700
Subject: [PATCH] For #13959: use ac StrictMode.resetAfter rather than
 duplicating functionality.

---
 app/src/main/java/org/mozilla/fenix/ext/StrictMode.kt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/ext/StrictMode.kt b/app/src/main/java/org/mozilla/fenix/ext/StrictMode.kt
index ecb73dc392..3caf21b981 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/StrictMode.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/StrictMode.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.ext
 
 import android.os.StrictMode
+import mozilla.components.support.ktx.android.os.resetAfter
 import org.mozilla.fenix.Config
 
 /**
@@ -15,11 +16,7 @@ import org.mozilla.fenix.Config
  */
 inline fun <R> StrictMode.ThreadPolicy.resetPoliciesAfter(functionBlock: () -> R): R {
     return if (Config.channel.isDebug) {
-        try {
-            functionBlock()
-        } finally {
-            StrictMode.setThreadPolicy(this)
-        }
+        resetAfter { functionBlock() }
     } else {
         functionBlock()
     }