From a0a02e5627da0bc8ba2da2cfbfcb7c0b9dc2be15 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Tue, 24 May 2022 18:05:59 +0300
Subject: [PATCH] For #25360: Selectively update addresses preference only when
 needed.

---
 .../fenix/settings/autofill/AutofillSettingFragment.kt       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
index 1a2916069..f2312ed15 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/autofill/AutofillSettingFragment.kt
@@ -91,7 +91,10 @@ class AutofillSettingFragment : BiometricPromptPreferenceFragment() {
         )
 
         updateSaveAndAutofillCardsSwitch()
-        updateSaveAndAutofillAddressesSwitch()
+
+        if (requireComponents.settings.addressFeature) {
+            updateSaveAndAutofillAddressesSwitch()
+        }
     }
 
     /**