Merge "Bind mount pkg specific dirs in the zygote child namespaces." (3bc4ab48) · Commits · e / os / android_frameworks_base

core/java/android/os/Process.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -483,6 +483,8 @@ public class Process {
	* @param appDataDir null-ok the data directory of the app.		* @param appDataDir null-ok the data directory of the app.
	* @param invokeWith null-ok the command to invoke with.		* @param invokeWith null-ok the command to invoke with.
	* @param packageName null-ok the name of the package this process belongs to.		* @param packageName null-ok the name of the package this process belongs to.
			* @param packagesForUid null-ok all the packages with the same uid as this process.
			* @param visibleVols null-ok storage volumes that can be accessed by this process.
	* @param zygoteArgs Additional arguments to supply to the zygote process.		* @param zygoteArgs Additional arguments to supply to the zygote process.
	*		*
	* @return An object that describes the result of the attempt to start the process.		* @return An object that describes the result of the attempt to start the process.
	@@ -501,10 +503,13 @@ public class Process {
	@Nullable String appDataDir,		@Nullable String appDataDir,
	@Nullable String invokeWith,		@Nullable String invokeWith,
	@Nullable String packageName,		@Nullable String packageName,
			@Nullable String[] packagesForUid,
			@Nullable String[] visibleVols,
	@Nullable String[] zygoteArgs) {		@Nullable String[] zygoteArgs) {
	return zygoteProcess.start(processClass, niceName, uid, gid, gids,		return zygoteProcess.start(processClass, niceName, uid, gid, gids,
	runtimeFlags, mountExternal, targetSdkVersion, seInfo,		runtimeFlags, mountExternal, targetSdkVersion, seInfo,
	abi, instructionSet, appDataDir, invokeWith, packageName, zygoteArgs);		abi, instructionSet, appDataDir, invokeWith, packageName,
			packagesForUid, visibleVols, zygoteArgs);
	}		}

	/** @hide */		/** @hide */
	@@ -519,10 +524,13 @@ public class Process {
	@Nullable String appDataDir,		@Nullable String appDataDir,
	@Nullable String invokeWith,		@Nullable String invokeWith,
	@Nullable String packageName,		@Nullable String packageName,
			@Nullable String[] packagesForUid,
			@Nullable String[] visibleVols,
	@Nullable String[] zygoteArgs) {		@Nullable String[] zygoteArgs) {
	return WebViewZygote.getProcess().start(processClass, niceName, uid, gid, gids,		return WebViewZygote.getProcess().start(processClass, niceName, uid, gid, gids,
	runtimeFlags, mountExternal, targetSdkVersion, seInfo,		runtimeFlags, mountExternal, targetSdkVersion, seInfo,
	abi, instructionSet, appDataDir, invokeWith, packageName, zygoteArgs);		abi, instructionSet, appDataDir, invokeWith, packageName,
			packagesForUid, visibleVols, zygoteArgs);
	}		}

	/**		/**

core/java/android/os/ZygoteProcess.java

+37 −2

Original line number	Original line	Diff line number	Diff line
	@@ -215,6 +215,8 @@ public class ZygoteProcess {
	* @param appDataDir null-ok the data directory of the app.		* @param appDataDir null-ok the data directory of the app.
	* @param invokeWith null-ok the command to invoke with.		* @param invokeWith null-ok the command to invoke with.
	* @param packageName null-ok the name of the package this process belongs to.		* @param packageName null-ok the name of the package this process belongs to.
			* @param packagesForUid null-ok all the packages with the same uid as this process.
			* @param visibleVols null-ok storage volumes that can be accessed by this process.
	* @param zygoteArgs Additional arguments to supply to the zygote process.		* @param zygoteArgs Additional arguments to supply to the zygote process.
	*		*
	* @return An object that describes the result of the attempt to start the process.		* @return An object that describes the result of the attempt to start the process.
	@@ -231,12 +233,14 @@ public class ZygoteProcess {
	@Nullable String appDataDir,		@Nullable String appDataDir,
	@Nullable String invokeWith,		@Nullable String invokeWith,
	@Nullable String packageName,		@Nullable String packageName,
			@Nullable String[] packagesForUid,
			@Nullable String[] visibleVols,
	@Nullable String[] zygoteArgs) {		@Nullable String[] zygoteArgs) {
	try {		try {
	return startViaZygote(processClass, niceName, uid, gid, gids,		return startViaZygote(processClass, niceName, uid, gid, gids,
	runtimeFlags, mountExternal, targetSdkVersion, seInfo,		runtimeFlags, mountExternal, targetSdkVersion, seInfo,
	abi, instructionSet, appDataDir, invokeWith, false /* startChildZygote */,		abi, instructionSet, appDataDir, invokeWith, false /* startChildZygote */,
	packageName, zygoteArgs);		packageName, packagesForUid, visibleVols, zygoteArgs);
	} catch (ZygoteStartFailedEx ex) {		} catch (ZygoteStartFailedEx ex) {
	Log.e(LOG_TAG,		Log.e(LOG_TAG,
	"Starting VM process through Zygote failed");		"Starting VM process through Zygote failed");
	@@ -355,6 +359,8 @@ public class ZygoteProcess {
	* @param startChildZygote Start a sub-zygote. This creates a new zygote process		* @param startChildZygote Start a sub-zygote. This creates a new zygote process
	* that has its state cloned from this zygote process.		* that has its state cloned from this zygote process.
	* @param packageName null-ok the name of the package this process belongs to.		* @param packageName null-ok the name of the package this process belongs to.
			* @param packagesForUid null-ok all the packages with the same uid as this process.
			* @param visibleVols null-ok storage volumes that can be accessed by this process.
	* @param extraArgs Additional arguments to supply to the zygote process.		* @param extraArgs Additional arguments to supply to the zygote process.
	* @return An object that describes the result of the attempt to start the process.		* @return An object that describes the result of the attempt to start the process.
	* @throws ZygoteStartFailedEx if process start failed for any reason		* @throws ZygoteStartFailedEx if process start failed for any reason
	@@ -372,6 +378,8 @@ public class ZygoteProcess {
	@Nullable String invokeWith,		@Nullable String invokeWith,
	boolean startChildZygote,		boolean startChildZygote,
	@Nullable String packageName,		@Nullable String packageName,
			@Nullable String[] packagesForUid,
			@Nullable String[] visibleVols,
	@Nullable String[] extraArgs)		@Nullable String[] extraArgs)
	throws ZygoteStartFailedEx {		throws ZygoteStartFailedEx {
	ArrayList<String> argsForZygote = new ArrayList<String>();		ArrayList<String> argsForZygote = new ArrayList<String>();
	@@ -439,6 +447,32 @@ public class ZygoteProcess {
	argsForZygote.add("--package-name=" + packageName);		argsForZygote.add("--package-name=" + packageName);
	}		}

			if (packagesForUid != null && packagesForUid.length > 0) {
			final StringBuilder sb = new StringBuilder();
			sb.append("--packages-for-uid=");

			for (int i = 0; i < packagesForUid.length; ++i) {
			if (i != 0) {
			sb.append(',');
			}
			sb.append(packagesForUid[i]);
			}
			argsForZygote.add(sb.toString());
			}

			if (visibleVols != null && visibleVols.length > 0) {
			final StringBuilder sb = new StringBuilder();
			sb.append("--visible-vols=");

			for (int i = 0; i < visibleVols.length; ++i) {
			if (i != 0) {
			sb.append(',');
			}
			sb.append(visibleVols[i]);
			}
			argsForZygote.add(sb.toString());
			}

	argsForZygote.add(processClass);		argsForZygote.add(processClass);

	if (extraArgs != null) {		if (extraArgs != null) {
	@@ -746,7 +780,8 @@ public class ZygoteProcess {
	result = startViaZygote(processClass, niceName, uid, gid,		result = startViaZygote(processClass, niceName, uid, gid,
	gids, runtimeFlags, 0 /* mountExternal /, 0 / targetSdkVersion */, seInfo,		gids, runtimeFlags, 0 /* mountExternal /, 0 / targetSdkVersion */, seInfo,
	abi, instructionSet, null /* appDataDir /, null / invokeWith */,		abi, instructionSet, null /* appDataDir /, null / invokeWith */,
	true /* startChildZygote /, null / packageName */, extraArgs);		true /* startChildZygote /, null / packageName */,
			null /* packagesForUid /, null / visibleVolumes */, extraArgs);
	} catch (ZygoteStartFailedEx ex) {		} catch (ZygoteStartFailedEx ex) {
	throw new RuntimeException("Starting child-zygote through Zygote failed", ex);		throw new RuntimeException("Starting child-zygote through Zygote failed", ex);
	}		}

core/java/android/os/storage/StorageManagerInternal.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,8 +89,13 @@ public abstract class StorageManagerInternal {
	* @param appId The appId for the given package.		* @param appId The appId for the given package.
	* @param sharedUserId The sharedUserId for given package if it specified		* @param sharedUserId The sharedUserId for given package if it specified
	* {@code android:sharedUserId} in the manifest, otherwise {@code null}		* {@code android:sharedUserId} in the manifest, otherwise {@code null}
	* @param userId		* @param userId The userId in which the storage needs to be mounted.
	*/		*/
	public abstract void mountExternalStorageForApp(String packageName, int appId,		public abstract void mountExternalStorageForApp(String packageName, int appId,
	String sharedUserId, int userId);		String sharedUserId, int userId);

			/**
			* @return Labels of storage volumes that are visible to the given userId.
			*/
			public abstract String[] getVisibleVolumesForUser(int userId);
	}		}

core/java/android/os/storage/VolumeInfo.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -157,7 +157,7 @@ public class VolumeInfo implements Parcelable {
	public final DiskInfo disk;		public final DiskInfo disk;
	public final String partGuid;		public final String partGuid;
	public int mountFlags = 0;		public int mountFlags = 0;
	public int mountUserId = -1;		public int mountUserId = UserHandle.USER_NULL;
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public int state = STATE_UNMOUNTED;		public int state = STATE_UNMOUNTED;
	public String fsType;		public String fsType;

core/java/com/android/internal/os/Zygote.java

+8 −7