[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 29859: Disable HLS support for now

[gk at torproject.org]

commit 14b7000757ad06197cb4e088731171f0a6ff325a
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/base/AppConstants.java.in      | 2 +-
 mobile/android/moz.configure                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js
index 02e3ef00c1b3..2410706bb5f5 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -57,5 +57,8 @@ 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);
+
 // Inherit locale from the OS, used for multi-locale builds
 pref("intl.locale.requested", "");
diff --git a/mobile/android/base/AppConstants.java.in b/mobile/android/base/AppConstants.java.in
index 26047188841c..762db8d86a1b 100644
--- a/mobile/android/base/AppConstants.java.in
+++ b/mobile/android/base/AppConstants.java.in
@@ -382,7 +382,7 @@ public class AppConstants {
 //#ifdef TOR_BROWSER_VERSION
         return true;
 //#else
-        return false;
+        return true;
 //#endif
     }
 }
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index c8ed3a9a59e1..cb536b790d94 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -92,7 +92,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)',