android: Async setupConnection binder call

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;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.process_launcher.ChildProcessCreationParams;
 import org.chromium.base.process_launcher.FileDescriptorInfo;
+import org.chromium.base.process_launcher.ICallbackInt;
 import org.chromium.base.process_launcher.IChildProcessService;
 
 import java.io.IOException;
 
 import javax.annotation.Nullable;
 
 /**
  * Manages a connection between the browser activity and a child service.
  */
 public class ChildProcessConnectionImpl implements ChildProcessConnection {
@@ skipping 348 matching lines @@
             mWaivedBinding.unbind();
             mModerateBinding.unbind();
             mStrongBindingCount = 0;
             if (mService != null) {
                 mService = null;
             }
             mConnectionParams = null;
         }
     }
 
+    private void onSetupConnectionResult(int pid) {
+        synchronized (mLock) {
+            mPid = pid;
+            assert mPid != 0 : "Child service claims to be run by a process of pid=0.";
+            // We proactively close the FDs rather than wait for GC & finalizer.
+            try {
+                for (FileDescriptorInfo fileInfo : mConnectionParams.mFilesToBeMapped) {
+                    fileInfo.fd.close();
+                }
+            } catch (IOException ioe) {
+                Log.w(TAG, "Failed to close FD.", ioe);
+            }
+            mConnectionParams = null;
+
+            if (mConnectionCallback != null) {
+                mConnectionCallback.onConnected(mPid);
+            }
+            mConnectionCallback = null;
+        }
+    }
+
     /**
      * Called after the connection parameters have been set (in setupConnection()) *and* a
      * connection has been established (as signaled by onServiceConnected()). These two events can
      * happen in any order. Has to be called with mLock.
      */
     private void doConnectionSetupLocked() {
         try {
             TraceEvent.begin("ChildProcessConnectionImpl.doConnectionSetupLocked");
             assert mServiceConnectComplete && mService != null;
             assert mConnectionParams != null;
 
             Bundle bundle = ChildProcessLauncher.createsServiceBundle(
                     mConnectionParams.mCommandLine, mConnectionParams.mFilesToBeMapped);
+            ICallbackInt pidCallback = new ICallbackInt.Stub() {
+                @Override
+                public void call(final int pid) {
+                    LauncherThread.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            onSetupConnectionResult(pid);
+                        }
+                    });
+                }
+            };
             try {
-                mPid = mService.setupConnection(bundle, mConnectionParams.mCallback);
-                assert mPid != 0 : "Child service claims to be run by a process of pid=0.";
-            } catch (android.os.RemoteException re) {
+                mService.setupConnection(bundle, pidCallback, mConnectionParams.mCallback);
+            } catch (RemoteException re) {
                 Log.e(TAG, "Failed to setup connection.", re);
             }
-            // We proactively close the FDs rather than wait for GC & finalizer.

[Robert Sesek, 2017/04/10 16:17:58]

Closing the FDs should still be possible after calling setupConnection.

[boliu, 2017/04/10 16:56:29]

Done.

-            try {
-                for (FileDescriptorInfo fileInfo : mConnectionParams.mFilesToBeMapped) {
-                    fileInfo.fd.close();
-                }
-            } catch (IOException ioe) {
-                Log.w(TAG, "Failed to close FD.", ioe);
-            }
-            mConnectionParams = null;
-
-            if (mConnectionCallback != null) {
-                mConnectionCallback.onConnected(mPid);
-            }
-            mConnectionCallback = null;
         } finally {
             TraceEvent.end("ChildProcessConnectionImpl.doConnectionSetupLocked");
         }
     }
 
     @Override
     public boolean isInitialBindingBound() {
         synchronized (mLock) {
             return mInitialBinding.isBound();
         }
@@ skipping 107 matching lines @@
     @VisibleForTesting
     public void crashServiceForTesting() throws RemoteException {
         mService.crashIntentionallyForTesting();
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }