Commit 3faedc0b authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Richard Pospesel
Browse files

fixup! Bug 25741: TBA: Disable GeckoNetworkManager 

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed TOR_BROWSER_VERSION to TOR_BROWSER.
parent 89d75b9e

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java

+5 −2
Original line number Diff line number Diff line
@@ -161,9 +161,12 @@ public final class GeckoRuntime implements Parcelable { 
      mPaused = false;

      // Monitor network status and send change notifications to Gecko

      // while active.

      if (BuildConfig.TOR_BROWSER_VERSION == "") {

      if (!BuildConfig.TOR_BROWSER) {

        GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());

      } else {

        Log.d(LOGTAG, "Tor Browser: skip GeckoNetworkManager startup"); 

      }



    }



    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
@@ -171,7 +174,7 @@ public final class GeckoRuntime implements Parcelable { 
      Log.d(LOGTAG, "Lifecycle: onPause");

      mPaused = true;

      // Stop monitoring network status while inactive.

      if (BuildConfig.TOR_BROWSER_VERSION == "") {

      if (!BuildConfig.TOR_BROWSER) {

        GeckoNetworkManager.getInstance().stop();

      }

      GeckoThread.onPause();