[tbb-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Disable GeckoNetworkManager

[gk at torproject.org]

commit 945c0a54fb87628cd1679839c6fa3c55e643ec04
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Thu Apr 26 22:22:51 2018 +0000

    Bug 25741 - TBA: Disable GeckoNetworkManager
    
    The browser should not need information related to the network
    interface or network state, tor should take care of that.
---
 mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
index f7464acdb019..9a5e89dc1579 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
@@ -199,12 +199,16 @@ public class GeckoApplication extends Application
         if (mIsInitialResume) {
             GeckoBatteryManager.getInstance().start(this);
             GeckoFontScaleListener.getInstance().initialize(this);
-            GeckoNetworkManager.getInstance().start(this);
+            if (!AppConstants.isTorBrowser()){
+              GeckoNetworkManager.getInstance().start(this);
+            }
             mIsInitialResume = false;
         } else if (mPausedGecko) {
             GeckoThread.onResume();
             mPausedGecko = false;
-            GeckoNetworkManager.getInstance().start(this);
+            if (!AppConstants.isTorBrowser()){
+              GeckoNetworkManager.getInstance().start(this);
+            }
         }
 
         mInBackground = false;