Skip to content

Commit 4e3e591

Browse files
committed
Backed out changeset a972719de032 (bug 1865705) for causing autofill related failures. CLOSED TREE
1 parent 8129e63 commit 4e3e591

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

modules/libpref/init/all.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3962,8 +3962,6 @@ pref("extensions.formautofill.available", "detect");
39623962
pref("extensions.formautofill.addresses.supported", "detect");
39633963
pref("extensions.formautofill.addresses.enabled", true);
39643964
pref("extensions.formautofill.addresses.capture.enabled", false);
3965-
// Whether address autofill is enabled or not ( this is set via Nimbus )
3966-
pref("extensions.formautofill.addresses.experiments.enabled", false);
39673965
// This preference should be removed entirely once address capture v2 developing is finished
39683966
pref("extensions.formautofill.addresses.capture.v2.enabled", false);
39693967
pref("extensions.formautofill.addresses.ignoreAutocompleteOff", true);

toolkit/components/formautofill/Constants.ios.mjs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ const IOS_DEFAULT_PREFERENCES = {
1414
"extensions.formautofill.creditCards.supported": "detect",
1515
"browser.search.region": "US",
1616
"extensions.formautofill.creditCards.supportedCountries": "US,CA,GB,FR,DE",
17-
"extensions.formautofill.addresses.enabled": true,
18-
"extensions.formautofill.addresses.autofill.enabled": false, // TODO(FXCM-765): fetch this value from swift
17+
"extensions.formautofill.addresses.enabled": false,
1918
"extensions.formautofill.addresses.capture.enabled": false,
2019
"extensions.formautofill.addresses.capture.v2.enabled": false,
2120
"extensions.formautofill.addresses.supportedCountries": "",

toolkit/components/formautofill/FormAutofill.sys.mjs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,18 @@ export const FormAutofill = {
9898
FormAutofill._creditCardAutofillSupportedCountries
9999
);
100100
},
101+
/**
102+
* Determines if the address autofill feature is available to use in the browser.
103+
* If the feature is not available, then there are no user facing ways to enable it.
104+
*
105+
* @returns {boolean} `true` if address autofill is available
106+
*/
107+
get isAutofillAddressesAvailable() {
108+
return this._isSupportedRegion(
109+
FormAutofill._isAutofillAddressesAvailable,
110+
FormAutofill._addressAutofillSupportedCountries
111+
);
112+
},
101113
/**
102114
* Determines if the user has enabled or disabled credit card autofill.
103115
*
@@ -257,12 +269,6 @@ XPCOMUtils.defineLazyPreferenceGetter(
257269
ENABLED_AUTOFILL_CAPTURE_ON_PAGE_NAVIGATION
258270
);
259271

260-
XPCOMUtils.defineLazyPreferenceGetter(
261-
FormAutofill,
262-
"isAutofillAddressesAvailable",
263-
"extensions.formautofill.addresses.experiments.enabled"
264-
);
265-
266272
// XXX: This should be invalidated on intl:app-locales-changed.
267273
ChromeUtils.defineLazyGetter(FormAutofill, "countries", () => {
268274
let availableRegionCodes =

toolkit/components/nimbus/FeatureManifest.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,6 @@ address-autofill-feature:
870870
variables:
871871
status:
872872
type: boolean
873-
setPref: "extensions.formautofill.addresses.experiments.enabled"
874873
description: If true, we will allow user to use address autofill
875874

876875
shellService:

0 commit comments

Comments
 (0)