[tbb-commits] [tor-browser/geckoview-95.0b12-11.5-1] Bug 25741 - TBA: Disable GeckoNetworkManager

[sysrqb at torproject.org]

commit e6058b316a797780bf11f0076b2eee6db8516d48
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 3d699391f926..f6989cbb6998 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
@@ -123,7 +123,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)
@@ -131,7 +133,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();
     }
   }