Abstracting parameters passed to child processes on Android.

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.DeadObjectException;
 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.content.app.ChromiumLinkerParams;
 import org.chromium.content.common.FileDescriptorInfo;
 import org.chromium.content.common.IChildProcessCallback;
 import org.chromium.content.common.IChildProcessService;
 
 import java.io.IOException;
 
 /**
  * Manages a connection between the browser activity and a child service.
  */
 public class ChildProcessConnectionImpl implements ChildProcessConnection {
@@ skipping 31 matching lines @@
     // Low priority binding maintained in the entire lifetime of the connection, i.e. between calls
     // to start() and stop().
     private ChildServiceConnection mWaivedBinding;
     // Incremented on addStrongBinding(), decremented on removeStrongBinding().
     private int mStrongBindingCount;
     // Moderate binding will make the service priority equal to the priority of a visible process
     // while the app is in the foreground. It will stay bound only while the app is in the
     // foreground to protect a background process from the system out-of-memory killer.
     private ChildServiceConnection mModerateBinding;
 
-    // Linker-related parameters.
-    private ChromiumLinkerParams mLinkerParams;
+    // Parameters passed to the child process through the service binding intent.
+    // If the service gets recreated by the framework the intent will be reused, so these parameters
+    // should be common to all processes of that type.
+    private final Bundle mChildProcessCommonParameters;
 
     private final boolean mAlwaysInForeground;
     private final ChildProcessCreationParams mCreationParams;
 
     // Caches whether non-sandboxed and sandboxed services require an extra
     // binding flag provided via ChildProcessCreationParams.
     // TODO(mnaganov): Get rid of it after the release of the next Android SDK.
     private static Boolean sNeedsExtrabindFlags[] = new Boolean[2];
 
     private static final String TAG = "ChildProcessConnect";
@@ skipping 41 matching lines @@
         }
 
         public ChildServiceConnection(int bindFlags) {
             mBindFlags = bindFlags;
         }
 
         boolean bind() {
             if (!mBound) {
                 try {
                     TraceEvent.begin("ChildProcessConnectionImpl.ChildServiceConnection.bind");
-                    final Intent intent = createServiceBindIntent();
-                    // Note, the intent may be saved and re-used by Android for re-launching the
-                    // child service. Do not pass data that is different for each child; command
-                    // line arguments for example.
-                    if (mLinkerParams != null) {
-                        mLinkerParams.addIntentExtras(intent);
+                    Intent intent = createServiceBindIntent();
+                    if (mChildProcessCommonParameters != null) {
+                        intent.putExtras(mChildProcessCommonParameters);
                     }
                     mBound = mContext.bindService(intent, this, mBindFlags);
                 } finally {
                     TraceEvent.end("ChildProcessConnectionImpl.ChildServiceConnection.bind");
                 }
             }
             return mBound;
         }
 
         void unbind() {
@@ skipping 80 matching lines @@
                 // the caller.
                 if (mConnectionCallback != null) {
                     mConnectionCallback.onConnected(0);
                 }
                 mConnectionCallback = null;
             }
         }
     }
 
     ChildProcessConnectionImpl(Context context, int number, boolean inSandbox,
-            ChildProcessConnection.DeathCallback deathCallback,
-            String serviceClassName,
-            ChromiumLinkerParams chromiumLinkerParams,
-            boolean alwaysInForeground,
+            ChildProcessConnection.DeathCallback deathCallback, String serviceClassName,
+            Bundle childProcessCommonParameters, boolean alwaysInForeground,
             ChildProcessCreationParams creationParams) {
         mContext = context;
         mServiceNumber = number;
         mInSandbox = inSandbox;
         mDeathCallback = deathCallback;
         String packageName =
                 creationParams != null ? creationParams.getPackageName() : context.getPackageName();
         mServiceName = new ComponentName(packageName, serviceClassName + mServiceNumber);
-        mLinkerParams = chromiumLinkerParams;
+        mChildProcessCommonParameters = childProcessCommonParameters;
         mAlwaysInForeground = alwaysInForeground;
         mCreationParams = creationParams;
         int initialFlags = Context.BIND_AUTO_CREATE;
         if (mAlwaysInForeground) initialFlags |= Context.BIND_IMPORTANT;
         int extraBindFlags = 0;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && mCreationParams != null
                 && mCreationParams.getIsExternalService()
                 && isExportedService(inSandbox, mContext, mServiceName)) {
             extraBindFlags = Context.BIND_EXTERNAL_SERVICE;
         }
@@ skipping 289 matching lines @@
             return true;
         }
         return false;
     }
 
     @VisibleForTesting
     public boolean isConnected() {
         return mService != null;
     }
 }