From 0b3e8675a7bbdb6a0fc4459fd720393f4c5cfb3a Mon Sep 17 00:00:00 2001 From: Dale Harvey Date: Mon, 6 May 2019 13:06:34 +0200 Subject: [PATCH] Bug 1549122: Duct tape to prevent deadlock when search extensions upgraded on startup. r=mikedeboer a=Aryx Differential Revision: https://phabricator.services.mozilla.com//D30004 --HG-- extra : rebase_source : 6637570bb828dfc86b1d0abfbafbd1cfdd12c9d8 extra : amend_source : 4803b6d8220d7d07a8a4f9562d4297090099a183 --- .../extensions/parent/ext-chrome-settings-overrides.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/components/extensions/parent/ext-chrome-settings-overrides.js b/browser/components/extensions/parent/ext-chrome-settings-overrides.js index 6be8745427a7..ec344269cc42 100644 --- a/browser/components/extensions/parent/ext-chrome-settings-overrides.js +++ b/browser/components/extensions/parent/ext-chrome-settings-overrides.js @@ -339,7 +339,8 @@ this.chrome_settings_overrides = class extends ExtensionAPI { let {extension} = this; let isCurrent = false; let index = -1; - if (extension.startupReason === "ADDON_UPGRADE") { + if (extension.startupReason === "ADDON_UPGRADE" && + !extension.addonData.builtIn) { let engines = await Services.search.getEnginesByExtensionID(extension.id); if (engines.length > 0) { let firstEngine = engines[0]; @@ -358,7 +359,8 @@ this.chrome_settings_overrides = class extends ExtensionAPI { extension.id, DEFAULT_SEARCH_STORE_TYPE, ENGINE_ADDED_SETTING_NAME, engines[0].name); } - if (extension.startupReason === "ADDON_UPGRADE") { + if (extension.startupReason === "ADDON_UPGRADE" && + !extension.addonData.builtIn) { let engines = await Services.search.getEnginesByExtensionID(extension.id); let engine = Services.search.getEngineByName(engines[0].name); if (isCurrent) {