diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 11:22:15 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-13 11:37:45 -0400 |
| commit | 8757548a3e5b5cc4d159d61eb4a12c7af1be548e (patch) | |
| tree | 3ad7d1f2c10d3d4c7a5d3779b2ee55cde34cfce6 /toolkit/modules/UpdateUtils.jsm | |
| parent | 714e9c9074d9eb2f4063962d07bae6b4f02a1e7a (diff) | |
| download | UXP-8757548a3e5b5cc4d159d61eb4a12c7af1be548e.tar UXP-8757548a3e5b5cc4d159d61eb4a12c7af1be548e.tar.gz UXP-8757548a3e5b5cc4d159d61eb4a12c7af1be548e.tar.lz UXP-8757548a3e5b5cc4d159d61eb4a12c7af1be548e.tar.xz UXP-8757548a3e5b5cc4d159d61eb4a12c7af1be548e.zip | |
Issue #991 Part 8: Toolkit everything else
Diffstat (limited to 'toolkit/modules/UpdateUtils.jsm')
| -rw-r--r-- | toolkit/modules/UpdateUtils.jsm | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index e92b1b797..fed7c7637 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -31,13 +31,9 @@ this.UpdateUtils = { * Whether or not to include the partner bits. Default: true. */ getUpdateChannel(aIncludePartners = true) { - let channel = AppConstants.MOZ_UPDATE_CHANNEL; + let channel = defaults.getCharPref("app.update.channel", + AppConstants.MOZ_UPDATE_CHANNEL); let defaults = Services.prefs.getDefaultBranch(null); - try { - channel = defaults.getCharPref("app.update.channel"); - } catch (e) { - // use default value when pref not found - } if (aIncludePartners) { try { @@ -93,15 +89,7 @@ this.UpdateUtils = { /* Get the distribution pref values, from defaults only */ function getDistributionPrefValue(aPrefName) { - var prefValue = "default"; - - try { - prefValue = Services.prefs.getDefaultBranch(null).getCharPref(aPrefName); - } catch (e) { - // use default when pref not found - } - - return prefValue; + return prefValue = Services.prefs.getDefaultBranch(null).getCharPref(aPrefName, "default"); } /** |