From f0c3ad095a44780e4957236341f13a8f27af9a44 Mon Sep 17 00:00:00 2001 From: Gregory Pappas Date: Sat, 17 Jun 2023 23:34:36 +0000 Subject: [PATCH] Bug 1837813 - Remove unused app.* prefs r=geckoview-reviewers,m_kato Depends on D180596 Differential Revision: https://phabricator.services.mozilla.com/D180597 --- layout/tools/reftest/remotereftest.py | 1 - mobile/android/app/mobile.js | 19 +------------------ testing/profiles/reftest/user.js | 1 - testing/profiles/unittest-required/user.js | 1 - 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/layout/tools/reftest/remotereftest.py b/layout/tools/reftest/remotereftest.py index 8d5e3fb44f007..a6f3d1b3cdd9e 100644 --- a/layout/tools/reftest/remotereftest.py +++ b/layout/tools/reftest/remotereftest.py @@ -336,7 +336,6 @@ def createReftestProfile(self, options, **kwargs): ) profileDir = profile.profile prefs = {} - prefs["app.update.url.android"] = "" prefs["reftest.remote"] = True prefs["datareporting.policy.dataSubmissionPolicyBypassAcceptance"] = True # move necko cache to a location that can be cleaned up diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 031f28e1b2196..2a88cbd61ac98 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -209,19 +209,7 @@ pref("plugin.disable", true); pref("breakpad.reportURL", "https://crash-stats.mozilla.org/report/index/"); pref("app.support.baseURL", "https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/"); -pref("app.supportURL", "https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/mobile-help"); -pref("app.faqURL", "https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq"); - -// URL for feedback page -// This should be kept in sync with the "feedback_link" string defined in strings.xml.in -pref("app.feedbackURL", "https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-prompt"); - -pref("app.privacyURL", "https://www.mozilla.org/privacy/firefox/"); -pref("app.creditsURL", "https://www.mozilla.org/credits/"); -pref("app.channelURL", "https://www.mozilla.org/%LOCALE%/firefox/channel/"); -#if MOZ_UPDATE_CHANNEL == aurora - pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/auroranotes/"); -#elif MOZ_UPDATE_CHANNEL == beta +#if MOZ_UPDATE_CHANNEL == beta pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%beta/releasenotes/"); #else pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/"); @@ -237,11 +225,6 @@ pref("security.cert_pinning.enforcement_level", 1); pref("app.update.timerFirstInterval", 30000); // milliseconds pref("app.update.timerMinimumDelay", 30); // seconds -// used by update service to decide whether or not to -// automatically download an update -pref("app.update.autodownload", "wifi"); -pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%MOZ_VERSION%/update.xml"); - #ifdef MOZ_UPDATER /* prefs used specifically for updating the app */ pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@"); diff --git a/testing/profiles/reftest/user.js b/testing/profiles/reftest/user.js index 2ac6af5a47db9..81c865abddf59 100644 --- a/testing/profiles/reftest/user.js +++ b/testing/profiles/reftest/user.js @@ -3,7 +3,6 @@ // Make sure Shield doesn't hit the network. user_pref("app.normandy.api_url", "https://localhost/selfsupport-dummy/"); user_pref("app.update.staging.enabled", false); -user_pref("app.update.url.android", ""); user_pref("browser.safebrowsing.blockedURIs.enabled", false); user_pref("browser.safebrowsing.downloads.enabled", false); user_pref("browser.safebrowsing.downloads.remote.url", "http://127.0.0.1/safebrowsing-dummy/gethash"); diff --git a/testing/profiles/unittest-required/user.js b/testing/profiles/unittest-required/user.js index b373c838c7ee6..27aa7eb7da7ff 100644 --- a/testing/profiles/unittest-required/user.js +++ b/testing/profiles/unittest-required/user.js @@ -12,7 +12,6 @@ user_pref("app.normandy.api_url", ""); // Make sure the notification permission migration test doesn't hit the network. user_pref("app.support.baseURL", "http://{server}/support-dummy/"); user_pref("app.update.staging.enabled", false); -user_pref("app.update.url.android", ""); // Increase the APZ content response timeout in tests to 1 minute. // This is to accommodate the fact that test environments tends to be slower // than production environments (with the b2g emulator being the slowest of them