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

[richard at torproject.org]

commit 0ea5299613197497f7b419e37f1619f8a460ada7
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.
---
 .../src/main/java/org/mozilla/geckoview/GeckoRuntime.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
index f084b522ad53..b94d8e803b6b 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
@@ -122,7 +122,9 @@ public final class GeckoRuntime implements Parcelable {
             mPaused = false;
             // Monitor network status and send change notifications to Gecko
             // while active.
-            GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+            if (BuildConfig.TOR_BROWSER_VERSION == "") {
+                GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+            }
         }
 
         @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
@@ -130,7 +132,9 @@ public final class GeckoRuntime implements Parcelable {
             Log.d(LOGTAG, "Lifecycle: onPause");
             mPaused = true;
             // Stop monitoring network status while inactive.
-            GeckoNetworkManager.getInstance().stop();
+            if (BuildConfig.TOR_BROWSER_VERSION == "") {
+                GeckoNetworkManager.getInstance().stop();
+            }
             GeckoThread.onPause();
         }
     }