[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29859: Disable HLS support for now

[gk at torproject.org]

commit 477af8c709134b57b530b4b94ce6b4c82cb46fce
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Mar 28 19:10:34 2019 +0000

    Bug 29859: Disable HLS support for now
---
 mobile/android/app/000-tor-browser-android.js | 3 +++
 mobile/android/moz.configure                  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index de51ec125406..b2ee9d0ded00 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -56,3 +56,6 @@ pref("general.useragent.updates.url", "");
 
 // Enable touch events on Android (highlighting text, etc)
 pref("dom.w3c_touch_events.enabled", 2);
+
+// No HLS support for now due to browser freezing, see: #29859.
+pref("media.hls.enabled", false);
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 7033d4283211..d0347b5fe0b8 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -96,7 +96,7 @@ project_flag('MOZ_SWITCHBOARD',
 
 project_flag('MOZ_ANDROID_HLS_SUPPORT',
              help='Enable HLS (HTTP Live Streaming) support (currently using the ExoPlayer library)',
-             default=True)
+             default=False)
 
 option(env='MOZ_ANDROID_ACTIVITY_STREAM',
        help='Enable Activity Stream on Android (replacing the default HomePager)',