tor-browser

commit b5063787bff177a375ab0dd9ded6193502a15893
parent 98609a5f9a008c07bc552aa232229eb017a62ff3
Author: Dan Ballard <dan@mindstab.net>
Date:   Mon, 19 Jan 2026 17:47:50 -0800

fixup! TB 42247: Android helpers for the TorProvider

Bug 43645: wiring in proper call to shutdown the tor process

Diffstat:
M
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/TorAndroidIntegration.java
@@ -102,8 +102,8 @@ public class TorAndroidIntegration implements BundleEventListener {
     registerListener();
   }
 
-  /* package */ synchronized void shutdown() {
-    // FIXME: It seems this never gets called
+  // To be called when the app is shutting down only
+  public synchronized void shutdown() {
     if (mTorProcess != null) {
       mTorProcess.shutdown();
       mTorProcess = null;
@@ -329,7 +329,7 @@ public class TorAndroidIntegration implements BundleEventListener {
           Log.i(TAG, "[tor-" + mHandle + "] " + line);
         }
       } catch (IOException e) {
-        Log.e(TAG, "Failed to read stdout of the tor process " + mHandle, e);
+        Log.e(TAG, "Failed to read stdout of the tor process " + mHandle + " (expected when program is exiting)", e);
       }
       Log.d(TAG, "Exiting the stdout loop for process " + mHandle);
       final GeckoBundle data = new GeckoBundle(2);