tor-browser

commit d46a5580b1dde33842fef9cbd3bcd21e77c1c9c3
parent 9f649eb526cc472e18bacc1f241ae6c1e5f1b191
Author: Olivia Hall <ohall@mozilla.com>
Date:   Thu, 30 Oct 2025 11:29:13 +0000

Bug 1995319 - Update Logging in ServiceAllocator to Capture Child PID r=m_kato,geckoview-reviewers

Added to be helpful for app zygote preloading cases.

Differential Revision: https://phabricator.services.mozilla.com/D270198

Diffstat:
M
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
 | 
2
+-
M
mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java
 | 
11
+++++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/GeckoProcessManager.java
@@ -194,7 +194,7 @@ public final class GeckoProcessManager extends IProcessManager.Stub {
       mPid = INVALID_PID;
     }
 
-    public int getPid() {
+    public int getPid() throws AssertionError, IncompleteChildConnectionException {
       XPCOMEventTarget.assertOnLauncherThread();
       if (mChild == null) {
         throw new IncompleteChildConnectionException(
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/process/ServiceAllocator.java
@@ -76,6 +76,8 @@ import org.mozilla.gecko.util.XPCOMEventTarget;
    * per-service connection objects.
    */
   public abstract static class InstanceInfo {
+    abstract int getPid() throws Exception;
+
     private class Binding implements ServiceConnection {
       /**
        * This implementation of ServiceConnection.onServiceConnected simply bounces the connection
@@ -375,6 +377,13 @@ import org.mozilla.gecko.util.XPCOMEventTarget;
       }
 
       final String svcName = mBindDelegate.getServiceName();
+      String pid;
+      try {
+        pid = String.valueOf(getPid());
+      } catch (final Exception e) {
+        pid = "not connected";
+      }
+
       final StringBuilder builder = new StringBuilder(svcName);
       builder
           .append(" updateBindings: ")
@@ -382,6 +391,8 @@ import org.mozilla.gecko.util.XPCOMEventTarget;
           .append(" priority, ")
           .append(mRelativeImportance)
           .append(" importance, ")
+          .append(pid)
+          .append(" pid, ")
           .append(numBindSuccesses)
           .append(" successful binds, ")
           .append(numBindFailures)