commit 4912857cacd85b02787a90b8939024b56d2b8cd1 Author: Georg Koppen gk@torproject.org Date: Wed Jun 10 12:46:33 2020 +0000

fixup! Bug 25741 - TBA: Disable GeckoNetworkManager

Bug 34372: Disable GeckoNetworkManager

We should only start and stop the network manager if we are *not* Tor Browser. --- .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 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 804b8f0000e9..6d28d919f8c4 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 @@ -118,7 +118,7 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onResume"); // Monitor network status and send change notifications to Gecko // while active. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); } } @@ -127,7 +127,7 @@ public final class GeckoRuntime implements Parcelable { void onPause() { Log.d(LOGTAG, "Lifecycle: onPause"); // Stop monitoring network status while inactive. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().stop(); } }