From 3cb2c83980a3fd799ddeef2d3f0745a17f73bef4 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Thu, 29 Oct 2020 15:16:07 +0200
Subject: [PATCH] For #16250: Disable remote USB debugging for SDK <23.

---
 app/src/main/java/org/mozilla/fenix/components/Core.kt        | 4 +++-
 .../main/java/org/mozilla/fenix/settings/SettingsFragment.kt  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/Core.kt b/app/src/main/java/org/mozilla/fenix/components/Core.kt
index d3db961b8..4389d6f1a 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Core.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Core.kt
@@ -7,6 +7,7 @@ package org.mozilla.fenix.components
 import GeckoProvider
 import android.content.Context
 import android.content.res.Configuration
+import android.os.Build
 import android.os.StrictMode
 import androidx.core.content.ContextCompat
 import io.sentry.Sentry
@@ -93,7 +94,8 @@ class Core(
     val engine: Engine by lazy {
         val defaultSettings = DefaultSettings(
             requestInterceptor = AppRequestInterceptor(context),
-            remoteDebuggingEnabled = context.settings().isRemoteDebuggingEnabled,
+            remoteDebuggingEnabled = context.settings().isRemoteDebuggingEnabled &&
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.M,
             testingModeEnabled = false,
             trackingProtectionPolicy = trackingProtectionPolicyFactory.createTrackingProtectionPolicy(),
             historyTrackingDelegate = HistoryDelegate(lazyHistoryStorage),
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index d4aa5873f..2a55d96b1 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -378,6 +378,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         preferenceExternalDownloadManager.isVisible = FeatureFlags.externalDownloadManager
+        preferenceRemoteDebugging?.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
         preferenceRemoteDebugging?.setOnPreferenceChangeListener<Boolean> { preference, newValue ->
             preference.context.settings().preferences.edit()
                 .putBoolean(preference.key, newValue).apply()