commit 8fe3191e67d007cf35969d888453096bd823af76 Author: Matthew Finkel Matthew.Finkel@gmail.com Date: Thu Sep 26 01:13:52 2019 +0000

fixup! Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs --- mobile/android/app/000-tor-browser-android.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 2410706bb5f5..7fdf796e5caf 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -23,7 +23,6 @@ pref("webchannel.allowObject.urlWhitelist", "");

// Disable browser auto updaters pref("app.update.auto", false); -pref("app.update.enabled", false); pref("browser.startup.homepage_override.mstone", "ignore");

// Clear data on quit @@ -39,10 +38,6 @@ pref("privacy.clearOnShutdown.siteSettings",true);

// Disable Control media casting & mirroring features pref("browser.casting.enabled", false); -pref("browser.mirroring.enabled", false); - -// Disable autoplay -pref("media.autoplay.enabled", false);

// controls if we want camera support pref("device.camera.enabled", false); @@ -62,3 +57,7 @@ pref("media.hls.enabled", false);

// Inherit locale from the OS, used for multi-locale builds pref("intl.locale.requested", ""); + +// Disable WebAuthn. It requires Google Play Services, so it isn't +// available, but avoid any potential problems. +pref("security.webauth.webauthn_enable_android_fido2", false);