From f05a5420600d0fe7bf7b9c220f0181e6cd82e3e8 Mon Sep 17 00:00:00 2001
From: Michael Comella <michael.l.comella@gmail.com>
Date: Tue, 22 Sep 2020 14:50:25 -0700
Subject: [PATCH] For #13959: always enable detectNonSdkApiUsage.

We don't use penalty death for the VM policy so we theoretically don't
need to disable this check if penalty death is enabled.
---
 app/src/main/java/org/mozilla/fenix/StrictModeManager.kt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt b/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt
index b624b097f..a9e6947ff 100644
--- a/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/StrictModeManager.kt
@@ -47,11 +47,7 @@ object StrictModeManager {
                 builder.detectContentUriWithoutPermission()
             }
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-                if (setPenaltyDeath || setPenaltyDialog) {
-                    builder.permitNonSdkApiUsage()
-                } else {
-                    builder.detectNonSdkApiUsage()
-                }
+                builder.detectNonSdkApiUsage()
             }
             StrictMode.setVmPolicy(builder.build())
         }