зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1110271 - Make GMPInstallManager default prefs available everywhere r=blassey
This commit is contained in:
Родитель
67edad67ab
Коммит
3ef87de0c2
|
@ -1775,45 +1775,6 @@ pref("media.eme.enabled", false);
|
|||
pref("media.eme.enabled", true);
|
||||
#endif
|
||||
|
||||
// GMPInstallManager prefs
|
||||
|
||||
// Enables some extra logging (can reduce performance)
|
||||
pref("media.gmp-manager.log", false);
|
||||
|
||||
// User-settable override to media.gmp-manager.url for testing purposes.
|
||||
//pref("media.gmp-manager.url.override", "");
|
||||
|
||||
// Update service URL for GMP install/updates:
|
||||
pref("media.gmp-manager.url", "https://aus4.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
|
||||
|
||||
// When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the
|
||||
// final certificate and all certificates the connection is redirected to before
|
||||
// the final certificate for the url specified in the |media.gmp-manager.url|
|
||||
// preference must be built-in.
|
||||
pref("media.gmp-manager.cert.requireBuiltIn", true);
|
||||
|
||||
// The |media.gmp-manager.certs.| preference branch contains branches that are
|
||||
// sequentially numbered starting at 1 that contain attribute name / value
|
||||
// pairs for the certificate used by the server that hosts the update xml file
|
||||
// as specified in the |media.gmp-manager.url| preference. When these preferences are
|
||||
// present the following conditions apply for a successful update check:
|
||||
// 1. the uri scheme must be https
|
||||
// 2. the preference name must exist as an attribute name on the certificate and
|
||||
// the value for the name must be the same as the value for the attribute name
|
||||
// on the certificate.
|
||||
// If these conditions aren't met it will be treated the same as when there is
|
||||
// no update available. This validation will not be performed when the
|
||||
// |media.gmp-manager.url.override| user preference has been set for testing updates or
|
||||
// when the |media.gmp-manager.cert.checkAttributes| preference is set to false. Also,
|
||||
// the |media.gmp-manager.url.override| preference should ONLY be used for testing.
|
||||
// IMPORTANT! app.update.certs.* prefs should also be updated if these
|
||||
// are updated.
|
||||
pref("media.gmp-manager.cert.checkAttributes", true);
|
||||
pref("media.gmp-manager.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US");
|
||||
pref("media.gmp-manager.certs.1.commonName", "aus4.mozilla.org");
|
||||
pref("media.gmp-manager.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US");
|
||||
pref("media.gmp-manager.certs.2.commonName", "aus4.mozilla.org");
|
||||
|
||||
// Play with different values of the decay time and get telemetry,
|
||||
// 0 means to randomize (and persist) the experiment value in users' profiles,
|
||||
// -1 means no experiment is run and we use the preferred value for frecency (6h)
|
||||
|
|
|
@ -4438,3 +4438,44 @@ pref("dom.mozSettings.SettingsService.verbose.enabled", false);
|
|||
// IndexedDB transactions to be opened as readonly or keep everything as
|
||||
// readwrite.
|
||||
pref("dom.mozSettings.allowForceReadOnly", false);
|
||||
|
||||
#ifndef MOZ_WIDGET_GONK
|
||||
// GMPInstallManager prefs
|
||||
|
||||
// Enables some extra logging (can reduce performance)
|
||||
pref("media.gmp-manager.log", false);
|
||||
|
||||
// User-settable override to media.gmp-manager.url for testing purposes.
|
||||
//pref("media.gmp-manager.url.override", "");
|
||||
|
||||
// Update service URL for GMP install/updates:
|
||||
pref("media.gmp-manager.url", "https://aus4.mozilla.org/update/3/GMP/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml");
|
||||
|
||||
// When |media.gmp-manager.cert.requireBuiltIn| is true or not specified the
|
||||
// final certificate and all certificates the connection is redirected to before
|
||||
// the final certificate for the url specified in the |media.gmp-manager.url|
|
||||
// preference must be built-in.
|
||||
pref("media.gmp-manager.cert.requireBuiltIn", true);
|
||||
|
||||
// The |media.gmp-manager.certs.| preference branch contains branches that are
|
||||
// sequentially numbered starting at 1 that contain attribute name / value
|
||||
// pairs for the certificate used by the server that hosts the update xml file
|
||||
// as specified in the |media.gmp-manager.url| preference. When these preferences are
|
||||
// present the following conditions apply for a successful update check:
|
||||
// 1. the uri scheme must be https
|
||||
// 2. the preference name must exist as an attribute name on the certificate and
|
||||
// the value for the name must be the same as the value for the attribute name
|
||||
// on the certificate.
|
||||
// If these conditions aren't met it will be treated the same as when there is
|
||||
// no update available. This validation will not be performed when the
|
||||
// |media.gmp-manager.url.override| user preference has been set for testing updates or
|
||||
// when the |media.gmp-manager.cert.checkAttributes| preference is set to false. Also,
|
||||
// the |media.gmp-manager.url.override| preference should ONLY be used for testing.
|
||||
// IMPORTANT! app.update.certs.* prefs should also be updated if these
|
||||
// are updated.
|
||||
pref("media.gmp-manager.cert.checkAttributes", true);
|
||||
pref("media.gmp-manager.certs.1.issuerName", "CN=DigiCert Secure Server CA,O=DigiCert Inc,C=US");
|
||||
pref("media.gmp-manager.certs.1.commonName", "aus4.mozilla.org");
|
||||
pref("media.gmp-manager.certs.2.issuerName", "CN=Thawte SSL CA,O=\"Thawte, Inc.\",C=US");
|
||||
pref("media.gmp-manager.certs.2.commonName", "aus4.mozilla.org");
|
||||
#endif
|
Загрузка…
Ссылка в новой задаче