Bind Android ChildProcessServices to a specific client PID.

content/public/android/java/src/org/chromium/content/browser/ChildProcessConnectionImpl.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
@@ skipping 79 matching lines @@
 
         ConnectionParams(String[] commandLine, FileDescriptorInfo[] filesToBeMapped,
                 IChildProcessCallback callback, Bundle sharedRelros) {
             mCommandLine = commandLine;
             mFilesToBeMapped = filesToBeMapped;
             mCallback = callback;
             mSharedRelros = sharedRelros;
         }
     }
 
+    // This is set in start() and is used in onServiceConnected().
+    private ChildProcessConnection.StartCallback mStartCallback;
+
     // This is set in setupConnection() and is later used in doConnectionSetupLocked(), after which
     // the variable is cleared. Therefore this is only valid while the connection is being set up.
     private ConnectionParams mConnectionParams;
 
     // Callback provided in setupConnection() that will communicate the result to the caller. This
     // has to be called exactly once after setupConnection(), even if setup fails, so that the
     // caller can free up resources associated with the setup attempt. This is set to null after the
     // call.
     private ChildProcessConnection.ConnectionCallback mConnectionCallback;
 
@@ skipping 51 matching lines @@
                 // A flag from the parent class ensures we run the post-connection logic only once
                 // (instead of once per each ChildServiceConnection).
                 if (mServiceConnectComplete) {
                     return;
                 }
                 try {
                     TraceEvent.begin(
                             "ChildProcessConnectionImpl.ChildServiceConnection.onServiceConnected");
                     mServiceConnectComplete = true;
                     mService = IChildProcessService.Stub.asInterface(service);
+
+                    boolean boundToUs = false;
+                    try {
+                        boundToUs = mService.bindToCaller();
+                    } catch (RemoteException ex) {
+                    } finally {

[Torne, 2017/01/16 12:44:43]

Unless there's another exception type that can happen here that we want to
propagate, there's no need for this to be in a finally block, it can just be
after the try-catch?

[Robert Sesek, 2017/01/17 19:51:22]

Done.

+                        if (!boundToUs) {
+                            if (mStartCallback != null) {
+                                mStartCallback.onChildStartFailed();
+                            }
+                            return;
+                        } else if (mStartCallback != null) {
+                            mStartCallback.onChildStarted();
+                        }
+                    }
+
                     // Run the setup if the connection parameters have already been provided. If
                     // not, doConnectionSetupLocked() will be called from setupConnection().
                     if (mConnectionParams != null) {
                         doConnectionSetupLocked();
                     }
                 } finally {
                     TraceEvent.end(
                             "ChildProcessConnectionImpl.ChildServiceConnection.onServiceConnected");
                 }
             }
@@ skipping 101 matching lines @@
     }
 
     @Override
     public int getPid() {
         synchronized (mLock) {
             return mPid;
         }
     }
 
     @Override
-    public void start(String[] commandLine) {
+    public void start(String[] commandLine, ChildProcessConnection.StartCallback startCallback) {
         try {
             TraceEvent.begin("ChildProcessConnectionImpl.start");
             synchronized (mLock) {
                 assert !ThreadUtils.runningOnUiThread();
                 assert mConnectionParams == null :
                         "setupConnection() called before start() in ChildProcessConnectionImpl.";
 
+                mStartCallback = startCallback;
+
                 if (!mInitialBinding.bind(commandLine)) {
                     Log.e(TAG, "Failed to establish the service connection.");
                     // We have to notify the caller so that they can free-up associated resources.
                     // TODO(ppi): Can we hard-fail here?
                     mDeathCallback.onChildProcessDied(ChildProcessConnectionImpl.this);
                 } else {
                     mWaivedBinding.bind(null);
                 }
             }
         } finally {
@@ skipping 205 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }