зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1695639) for remote crashes CLOSED TREE
Backed out changeset a54388a30704 (bug 1695639) Backed out changeset d345b8a1d9ec (bug 1695639)
This commit is contained in:
Родитель
75825b6bb5
Коммит
9d696ebe03
|
@ -7,13 +7,6 @@
|
|||
var EXPORTED_SYMBOLS = ["RecommendedPreferences"];
|
||||
|
||||
const RecommendedPreferences = {
|
||||
// Disable automatically upgrading Firefox
|
||||
//
|
||||
// Note: This preference should have already been set by the client when
|
||||
// creating the profile. But if not and to absolutely make sure that updates
|
||||
// of Firefox aren't downloaded and applied, enforce its presence.
|
||||
"app.update.disabledForTesting": true,
|
||||
|
||||
// Allow the application to have focus even when it runs in the background.
|
||||
"focusmanager.testmode": true,
|
||||
|
||||
|
|
|
@ -39,17 +39,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
|
|||
WindowsRegistry: "resource://gre/modules/WindowsRegistry.jsm",
|
||||
});
|
||||
|
||||
if (AppConstants.ENABLE_REMOTE_AGENT) {
|
||||
XPCOMUtils.defineLazyServiceGetter(
|
||||
this,
|
||||
"RemoteAgent",
|
||||
"@mozilla.org/remote/agent;1",
|
||||
"nsIRemoteAgent"
|
||||
);
|
||||
} else {
|
||||
this.RemoteAgent = { listening: false };
|
||||
}
|
||||
|
||||
const UPDATESERVICE_CID = Components.ID(
|
||||
"{B3C290A6-3943-4B89-8BBE-C01EB7B3B311}"
|
||||
);
|
||||
|
@ -3594,7 +3583,7 @@ UpdateService.prototype = {
|
|||
}
|
||||
|
||||
return (
|
||||
(Cu.isInAutomation || marionetteRunning || RemoteAgent.listening) &&
|
||||
(Cu.isInAutomation || marionetteRunning) &&
|
||||
Services.prefs.getBoolPref(PREF_APP_UPDATE_DISABLEDFORTESTING, false)
|
||||
);
|
||||
},
|
||||
|
|
Загрузка…
Ссылка в новой задаче